Merge branch 'cassandra-3.5' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5b2ffa8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5b2ffa8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5b2ffa8 Branch: refs/heads/trunk Commit: b5b2ffa8d75c462762bea29fb62421371e1ffcb7 Parents: f042247 df18c9b Author: Marcus Eriksson <marc...@apache.org> Authored: Tue Mar 29 11:21:50 2016 +0200 Committer: Marcus Eriksson <marc...@apache.org> Committed: Tue Mar 29 11:21:50 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/db/lifecycle/LifecycleTransaction.java | 5 ++++- .../org/apache/cassandra/io/sstable/SSTableWriterTestBase.java | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5b2ffa8/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5b2ffa8/src/java/org/apache/cassandra/db/lifecycle/LifecycleTransaction.java ----------------------------------------------------------------------
