cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/2] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Thu, 05 Nov 2015 23:22:50 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/d128103b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d128103b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d128103b

Branch: refs/heads/trunk
Commit: d128103b3dbdf2c225170084b117a7e76c708a5f
Parents: bc674c1 f3eb4ce
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Thu Nov 5 23:22:34 2015 +0000
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Thu Nov 5 23:22:34 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                            | 1 +
 src/java/org/apache/cassandra/db/ConsistencyLevel.java | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d128103b/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 311a07d,1dd1ed2..d641314
--- 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
+  * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)
   * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634)
   * (Hadoop) fix CIF describeSplits() not handling 0 size estimates (CASSANDRA-10600)
   * Fix reading of legacy sstables (CASSANDRA-10590)


Mime
View raw message