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/ce631bdd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ce631bdd Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ce631bdd Branch: refs/heads/trunk Commit: ce631bdd10e6d30cd7225b6629c7b0b92782a7af Parents: d10d5ca 36a3ba0 Author: Jeff Jirsa <[email protected]> Authored: Sun Dec 4 13:55:19 2016 -0800 Committer: Jeff Jirsa <[email protected]> Committed: Sun Dec 4 13:56:51 2016 -0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/repair/SystemDistributedKeyspace.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ce631bdd/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d917570,b75a1e4..811c78d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -11,8 -2,8 +11,9 @@@ * NoReplicationTokenAllocator should work with zero replication factor (CASSANDRA-12983) * cqlsh auto completion: refactor definition of compaction strategy options (CASSANDRA-12946) * Add support for arithmetic operators (CASSANDRA-11935) + * Tables in system_distributed should not use gcgs of 0 (CASSANDRA-12954) + 3.10 * Use correct bounds for all-data range when filtering (CASSANDRA-12666) * Remove timing window in test case (CASSANDRA-12875)
