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/34822301 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/34822301 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/34822301 Branch: refs/heads/trunk Commit: 34822301c2b12253eda5465d46fe47f61655dba3 Parents: da4f7f1 88892af Author: Joshua McKenzie <[email protected]> Authored: Fri Nov 13 10:03:50 2015 -0500 Committer: Joshua McKenzie <[email protected]> Committed: Fri Nov 13 10:03:50 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/lifecycle/LogFile.java | 7 ++++--- .../org/apache/cassandra/db/lifecycle/LogTransaction.java | 6 ++---- 2 files changed, 6 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
