Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52d5eb04 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52d5eb04 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52d5eb04 Branch: refs/heads/trunk Commit: 52d5eb04f625fffa1855f7e7d3e38eff79ea1828 Parents: 220f253 d1a596a Author: Marcus Eriksson <marc...@apache.org> Authored: Fri Dec 4 14:27:26 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Fri Dec 4 14:27:26 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/52d5eb04/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 711bdde,87d2e82..1607a66 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,19 -1,6 +1,20 @@@ +3.2 + * Normalize all scripts (CASSANDRA-10679) + * Make compression ratio much more accurate (CASSANDRA-10225) + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 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) http://git-wip-us.apache.org/repos/asf/cassandra/blob/52d5eb04/src/java/org/apache/cassandra/db/SystemKeyspace.java ----------------------------------------------------------------------
