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/53e73df6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/53e73df6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/53e73df6 Branch: refs/heads/trunk Commit: 53e73df65b1c090b949f0f783adfc27a9fb5066a Parents: 036f6b7 00bcccc Author: Benedict Elliott Smith <[email protected]> Authored: Wed Aug 19 13:38:49 2015 +0100 Committer: Benedict Elliott Smith <[email protected]> Committed: Wed Aug 19 13:38:49 2015 +0100 ---------------------------------------------------------------------- .../org/apache/cassandra/db/lifecycle/TransactionLog.java | 4 ++-- src/java/org/apache/cassandra/io/util/FileUtils.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
