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/b11be4da Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b11be4da Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b11be4da Branch: refs/heads/trunk Commit: b11be4da58e7a00d696991766b07197729680151 Parents: 3462a23 a1a260c Author: Joshua McKenzie <[email protected]> Authored: Tue Aug 11 15:03:07 2015 -0400 Committer: Joshua McKenzie <[email protected]> Committed: Tue Aug 11 15:03:07 2015 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/db/lifecycle/LifecycleTransaction.java | 3 ++- .../apache/cassandra/db/lifecycle/LifecycleTransactionTest.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
