Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3a2dd0cf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3a2dd0cf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3a2dd0cf Branch: refs/heads/trunk Commit: 3a2dd0cf60f34c242c53d59ad144e76558dface9 Parents: 87f16ca 73781a9 Author: Joshua McKenzie <jmcken...@apache.org> Authored: Fri Oct 23 17:43:32 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Fri Oct 23 17:43:32 2015 -0400 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/Memtable.java | 28 +- .../db/lifecycle/LifecycleTransaction.java | 39 +- .../db/lifecycle/LogAwareFileLister.java | 3 +- .../apache/cassandra/db/lifecycle/LogFile.java | 263 +++++---- .../cassandra/db/lifecycle/LogRecord.java | 192 +++++-- .../cassandra/db/lifecycle/LogReplica.java | 105 ++++ .../cassandra/db/lifecycle/LogReplicaSet.java | 229 ++++++++ .../cassandra/db/lifecycle/LogTransaction.java | 150 +++-- .../apache/cassandra/db/lifecycle/Tracker.java | 4 +- .../cassandra/io/sstable/SSTableTxnWriter.java | 4 +- .../org/apache/cassandra/io/util/FileUtils.java | 20 +- .../cassandra/streaming/StreamReceiveTask.java | 2 +- .../org/apache/cassandra/utils/Throwables.java | 5 + .../unit/org/apache/cassandra/db/ScrubTest.java | 2 +- .../cassandra/db/lifecycle/HelpersTest.java | 2 +- .../db/lifecycle/LogTransactionTest.java | 575 +++++++++++++++---- .../db/lifecycle/RealTransactionsTest.java | 6 +- .../io/sstable/SSTableRewriterTest.java | 2 +- 19 files changed, 1232 insertions(+), 400 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3a2dd0cf/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 2ecad90,bc7c001..dae9264 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +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.0 + * Fix LogTransaction checking only a single directory for files (CASSANDRA-10421) * Support encrypted and plain traffic on the same port (CASSANDRA-10559) * Fix handling of range tombstones when reading old format sstables (CASSANDRA-10360) * Aggregate with Initial Condition fails with C* 3.0 (CASSANDRA-10367)
