Merge branch 'cassandra-2.1' into cassandra-2.2
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/bf0328f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bf0328f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bf0328f4
Branch: refs/heads/cassandra-2.2
Commit: bf0328f484535667bf92743d86a061872e4a1786
Parents: a11f9b6 c4b5260
Author: Jason Brown <[email protected]>
Authored: Wed Jul 8 14:14:09 2015 -0700
Committer: Jason Brown <[email protected]>
Committed: Wed Jul 8 14:14:09 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/service/StorageService.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf0328f4/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index cc7b109,7635227..ced3a1e
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -4,7 -3,8 +4,8 @@@ Merged from 2.1
* (cqlsh) Allow the SSL protocol version to be specified through the
config file or environment variables (CASSANDRA-9544)
Merged from 2.0:
+ * Can't transition from write survey to normal mode (CASSANDRA-9740)
- * Scrub (recover) sstables even when -Index.db is missing, (CASSANDRA-9591)
+ * Scrub (recover) sstables even when -Index.db is missing (CASSANDRA-9591)
* Fix growing pending background compaction (CASSANDRA-9662)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bf0328f4/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
