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 Fri, 06 Nov 2015 09:55:12 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/943294ba
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/943294ba
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/943294ba

Branch: refs/heads/trunk
Commit: 943294ba2914ceefd81f4937e182c484041f26ca
Parents: 8f189d1 9253360
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Nov 6 10:55:03 2015 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Nov 6 10:55:03 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                               | 1 +
 src/java/org/apache/cassandra/db/filter/ColumnFilter.java | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/943294ba/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 2c3548a,98c98ab..5352f22
--- 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
+  * Remove value skipping as it breaks read-repair (CASSANDRA-10655)
   * Fix bootstrapping with MVs (CASSANDRA-10621)
   * Make sure EACH_QUORUM reads are using NTS (CASSANDRA-10584)
   * Fix MV replica filtering for non-NetworkTopologyStrategy (CASSANDRA-10634)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/943294ba/src/java/org/apache/cassandra/db/filter/ColumnFilter.java
----------------------------------------------------------------------


Mime
View raw message