Merge branch 'cassandra-3.0' into cassandra-3.5
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df18c9b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df18c9b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/df18c9b6 Branch: refs/heads/trunk Commit: df18c9b6c13225c9f62ce6ace544060f3264c8f0 Parents: 0a25085 0104834 Author: Marcus Eriksson <[email protected]> Authored: Tue Mar 29 11:21:11 2016 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Tue Mar 29 11:21:11 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/df18c9b6/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/df18c9b6/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java ----------------------------------------------------------------------
