Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/03df4c74 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/03df4c74 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/03df4c74 Branch: refs/heads/trunk Commit: 03df4c7460f8047f4af2cfc1b19318394b68b788 Parents: 496418c 1513139 Author: Yuki Morishita <yu...@apache.org> Authored: Fri Apr 1 12:45:42 2016 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Fri Apr 1 12:45:42 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../db/lifecycle/LogAwareFileLister.java | 23 ------- .../apache/cassandra/io/sstable/Descriptor.java | 20 +++++-- .../db/lifecycle/LogTransactionTest.java | 63 +++++++++++++++----- .../cassandra/io/sstable/DescriptorTest.java | 40 +++++++++---- 5 files changed, 90 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/03df4c74/CHANGES.txt ----------------------------------------------------------------------
