Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d1a596a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d1a596a4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d1a596a4 Branch: refs/heads/trunk Commit: d1a596a4ad6717f03917877fc50714bafa55de97 Parents: fd5cb43 d0da9e7 Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Dec 4 14:27:14 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Dec 4 14:27:14 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/SystemKeyspace.java | 10 +++++--- .../apache/cassandra/db/SystemKeyspaceTest.java | 27 ++++++++++++++++++-- 3 files changed, 33 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d1a596a4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 7a6076b,520afff..87d2e82 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,5 -1,5 +1,6 @@@ -3.0.1 +3.1 +Merged from 3.0: + * Fix issue with datadir migration on upgrade (CASSANDRA-10788) * Fix bug with range tombstones on reverse queries and test coverage for AbstractBTreePartition (CASSANDRA-10059) * Remove 64k limit on collection elements (CASSANDRA-10374)
