Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a1a260c9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a1a260c9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a1a260c9 Branch: refs/heads/trunk Commit: a1a260c9fda7d87c4a3b2386f298ae5cd94d1960 Parents: 72acd6b 1960e5b Author: Joshua McKenzie <[email protected]> Authored: Tue Aug 11 15:02:52 2015 -0400 Committer: Joshua McKenzie <[email protected]> Committed: Tue Aug 11 15:02:52 2015 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/db/lifecycle/LifecycleTransaction.java | 3 ++- .../apache/cassandra/db/lifecycle/LifecycleTransactionTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1a260c9/src/java/org/apache/cassandra/db/lifecycle/LifecycleTransaction.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a1a260c9/test/unit/org/apache/cassandra/db/lifecycle/LifecycleTransactionTest.java ----------------------------------------------------------------------
