You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/11/13 16:04:07 UTC
[6/6] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
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 <jm...@apache.org>
Authored: Fri Nov 13 10:03:50 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
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(-)
----------------------------------------------------------------------