Merge branch 'cassandra-3.0' into cassandra-3.1
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/2b8cdc23
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2b8cdc23
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2b8cdc23
Branch: refs/heads/trunk
Commit: 2b8cdc2343a2169f764511a54f32e0cd41078f40
Parents: eb0f56d a4da379
Author: Joshua McKenzie <[email protected]>
Authored: Fri Dec 4 14:30:37 2015 -0500
Committer: Joshua McKenzie <[email protected]>
Committed: Fri Dec 4 14:30:37 2015 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
NEWS.txt | 18 +++-----
.../org/apache/cassandra/db/SystemKeyspace.java | 15 ++++++
.../cassandra/service/CassandraDaemon.java | 15 ------
.../apache/cassandra/service/StartupChecks.java | 48 +++++++++++++++++++-
5 files changed, 70 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2b8cdc23/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 7c7e301,8f3f182..e06653f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,5 -1,5 +1,6 @@@
-3.0.1
+3.1
+Merged from 3.0:
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
* Handle single-column deletions correction in materialized views
when the column is part of the view primary key (CASSANDRA-10796)
* Fix issue with datadir migration on upgrade (CASSANDRA-10788)
