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/0c1c5556 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c1c5556 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c1c5556 Branch: refs/heads/trunk Commit: 0c1c555662a6817452c6cc7dd3ff6583f63c3dba Parents: 402a12f 45c04b7 Author: Benedict Elliott Smith <bened...@apache.org> Authored: Mon Aug 10 16:37:06 2015 +0200 Committer: Benedict Elliott Smith <bened...@apache.org> Committed: Mon Aug 10 16:37:06 2015 +0200 ---------------------------------------------------------------------- .../apache/cassandra/db/ColumnFamilyStore.java | 5 +++- .../AbstractSimplePerColumnSecondaryIndex.java | 12 +++++++++ .../cassandra/db/lifecycle/TransactionLogs.java | 2 +- .../org/apache/cassandra/io/util/FileUtils.java | 6 +++++ .../cassandra/db/lifecycle/TrackerTest.java | 11 ++++++--- .../db/lifecycle/TransactionLogsTest.java | 26 +++++++++++++++++++- 6 files changed, 56 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
