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:05 UTC
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88892af9
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88892af9
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88892af9
Branch: refs/heads/trunk
Commit: 88892af934af23fa15571e165c79446d3ef1bd43
Parents: f92f69c 3223927
Author: Joshua McKenzie <jm...@apache.org>
Authored: Fri Nov 13 10:03:45 2015 -0500
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Fri Nov 13 10:03:45 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(-)
----------------------------------------------------------------------