You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2016/05/30 14:16:53 UTC
[6/7] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.7
Merge branch 'cassandra-3.0' into cassandra-3.7
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ac62a603
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac62a603
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac62a603
Branch: refs/heads/cassandra-3.7
Commit: ac62a603ae99f1569c46aee73ab609856fa2dd18
Parents: 22e0a1d 8540415
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon May 30 16:07:11 2016 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon May 30 16:07:11 2016 +0200
----------------------------------------------------------------------
CHANGES.txt | 3 ++-
src/java/org/apache/cassandra/db/Keyspace.java | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac62a603/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 8a854ac,6d5117f..d211f48
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,6 -1,5 +1,7 @@@
-3.0.7
+3.7
- * Don't use static dataDirectories field in Directories instances (CASSANDRA-11647)
+Merged from 3.0:
++ * Don't use static dataDirectories field in Directories instances (CASSANDRA-11647)
+ * Fix sstables not being protected from removal during index build (CASSANDRA-11905)
* cqlsh: Suppress stack trace from Read/WriteFailures (CASSANDRA-11032)
* Remove unneeded code to repair index summaries that have
been improperly down-sampled (CASSANDRA-11127)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/ac62a603/src/java/org/apache/cassandra/db/Keyspace.java
----------------------------------------------------------------------