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/f6dff616 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6dff616 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6dff616 Branch: refs/heads/trunk Commit: f6dff616fed3c12dd307424bd0ccbf979c25d053 Parents: e449450 dcca996 Author: Yuki Morishita <[email protected]> Authored: Fri Feb 28 15:30:46 2014 -0600 Committer: Yuki Morishita <[email protected]> Committed: Fri Feb 28 15:30:46 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/io/sstable/SSTableLoader.java | 7 +++---- src/java/org/apache/cassandra/streaming/StreamPlan.java | 11 ++++++++++- .../apache/cassandra/streaming/StreamResultFuture.java | 7 ++++++- src/java/org/apache/cassandra/tools/BulkLoader.java | 7 ++++--- 5 files changed, 24 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f6dff616/CHANGES.txt ----------------------------------------------------------------------
