Merge branch 'cassandra-3.X' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/aedb2187 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aedb2187 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/aedb2187 Branch: refs/heads/trunk Commit: aedb2187a3e85cfc23afe6356cf5e3f916b58ad8 Parents: 2e15fc3 d4a914d Author: Jeff Jirsa <jeff.ji...@crowdstrike.com> Authored: Fri Oct 21 19:04:52 2016 -0700 Committer: Jeff Jirsa <jeff.ji...@crowdstrike.com> Committed: Fri Oct 21 19:05:25 2016 -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/aedb2187/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index bd355ef,b965262..bb8949c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -148,7 -140,7 +148,8 @@@ Merged from 2.2 * Forward writes to replacement node when replace_address != broadcast_address (CASSANDRA-8523) * Fail repair on non-existing table (CASSANDRA-12279) * Enable repair -pr and -local together (fix regression of CASSANDRA-7450) (CASSANDRA-12522) + * Better handle invalid system roles table (CASSANDRA-12700) + * Split consistent range movement flag correction (CASSANDRA-12786) Merged from 2.1: * Don't skip sstables based on maxLocalDeletionTime (CASSANDRA-12765)
