Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca9c4b46 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca9c4b46 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ca9c4b46 Branch: refs/heads/trunk Commit: ca9c4b468fd47550905699ad6a03d9b114e48ccd Parents: 2ba011e a6efffe Author: Yuki Morishita <[email protected]> Authored: Fri Apr 25 19:46:57 2014 -0500 Committer: Yuki Morishita <[email protected]> Committed: Fri Apr 25 19:46:57 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/io/sstable/SSTableLoader.java | 23 ++++-- .../apache/cassandra/streaming/StreamPlan.java | 3 +- .../cassandra/streaming/StreamSession.java | 77 +++++++++++--------- 4 files changed, 63 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ca9c4b46/CHANGES.txt ----------------------------------------------------------------------
