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/719e7d66 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/719e7d66 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/719e7d66 Branch: refs/heads/trunk Commit: 719e7d6624c2755295dd89670cff1aebf3c73795 Parents: db8df91 73a8341 Author: Marcus Eriksson <[email protected]> Authored: Mon Jun 13 15:16:33 2016 +0200 Committer: Marcus Eriksson <[email protected]> Committed: Mon Jun 13 15:16:33 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/config/DatabaseDescriptor.java | 4 ++ .../org/apache/cassandra/db/lifecycle/View.java | 11 +++ .../cassandra/streaming/StreamSession.java | 18 +++-- .../io/sstable/SSTableRewriterTest.java | 75 +++++++++++++++++--- 5 files changed, 88 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/719e7d66/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/719e7d66/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/719e7d66/src/java/org/apache/cassandra/db/lifecycle/View.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/719e7d66/src/java/org/apache/cassandra/streaming/StreamSession.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/719e7d66/test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java ----------------------------------------------------------------------
