cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [5/5] cassandra git commit: Merge branch cassandra-3.X into trunk
Date Tue, 08 Nov 2016 17:23:53 GMT
Merge branch cassandra-3.X into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1eea75bc
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1eea75bc
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1eea75bc

Branch: refs/heads/trunk
Commit: 1eea75bcc4cc88365ea4ac1058a63ad93d139003
Parents: b6cb2ab 8ae3139
Author: Benjamin Lerer <b.lerer@gmail.com>
Authored: Tue Nov 8 18:22:53 2016 +0100
Committer: Benjamin Lerer <b.lerer@gmail.com>
Committed: Tue Nov 8 18:23:15 2016 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |  2 +
 test/unit/org/apache/cassandra/Util.java        |  6 +-
 .../commitlog/CommitLogSegmentManagerTest.java  | 93 ++++++++++++--------
 3 files changed, 60 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1eea75bc/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0332f50,dd9088b..69a05c2
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
 +4.0
 + * Add column definition kind to dropped columns in schema (CASSANDRA-12705)
 + * Add (automate) Nodetool Documentation (CASSANDRA-12672)
 + * Update bundled cqlsh python driver to 3.7.0 (CASSANDRA-12736)
 + * Reject invalid replication settings when creating or altering a keyspace (CASSANDRA-12681)
 + * Clean up the SSTableReader#getScanner API wrt removal of RateLimiter (CASSANDRA-12422)
 +
 +
  3.10
+  * Fix CommitLogSegmentManagerTest (CASSANDRA-12283)
   * Fix cassandra-stress truncate option (CASSANDRA-12695)
   * Fix crossNode value when receiving messages (CASSANDRA-12791)
   * Don't load MX4J beans twice (CASSANDRA-12869)


Mime
View raw message