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/f2e2862f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f2e2862f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f2e2862f Branch: refs/heads/trunk Commit: f2e2862f5c47680871ce6329654504140683c241 Parents: d286ac7 0337620 Author: Tyler Hobbs <ty...@datastax.com> Authored: Tue Nov 11 11:41:08 2014 -0600 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Tue Nov 11 11:41:08 2014 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/dht/RangeStreamer.java | 10 +++++----- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2e2862f/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2e2862f/src/java/org/apache/cassandra/dht/RangeStreamer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f2e2862f/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
