cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Mon, 02 Nov 2015 14:29:26 GMT
Merge branch 'cassandra-3.0' into trunk


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

Branch: refs/heads/trunk
Commit: 40d1425a155a3b5cd8d5a7cd98900283ed5be143
Parents: b1f2d14 cba5ef6
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Mon Nov 2 15:29:15 2015 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Mon Nov 2 15:29:15 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                        |  1 +
 src/java/org/apache/cassandra/db/LegacyLayout.java | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/40d1425a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 3b33f5d,1724f01..37f7aa4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,10 -1,5 +1,11 @@@
 +3.2
 + * Added graphing option to cassandra-stress (CASSANDRA-7918)
 + * Abort in-progress queries that time out (CASSANDRA-7392)
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0
+  * Fix implementation of LegacyLayout.LegacyBoundComparator (CASSANDRA-10602)
   * Don't use 'names query' read path for counters (CASSANDRA-10572)
   * Fix backward compatibility for counters (CASSANDRA-10470)
   * Remove memory_allocator paramter from cassandra.yaml (CASSANDRA-10581)


Mime
View raw message