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/55811e56 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/55811e56 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/55811e56 Branch: refs/heads/trunk Commit: 55811e561087da01c365aab74eb576cda11bddd7 Parents: 3820e89 6f7b389 Author: Marcus Eriksson <marc...@apache.org> Authored: Wed Nov 11 08:56:12 2015 +0100 Committer: Marcus Eriksson <marc...@apache.org> Committed: Wed Nov 11 08:56:12 2015 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/io/sstable/SSTableRewriter.java | 5 +--- .../org/apache/cassandra/utils/CLibrary.java | 29 ++++++++++---------- .../apache/cassandra/utils/CLibraryTest.java | 3 +- 4 files changed, 17 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/55811e56/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 14b3a3f,5a1e79a..8bed34b --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,11 -1,6 +1,12 @@@ +3.2 + * 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: + * Keep the file open in trySkipCache (CASSANDRA-10669) * Updated trigger example (CASSANDRA-10257) Merged from 2.2: * (Hadoop) fix splits calculation (CASSANDRA-10640)
