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/af8c2a3a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af8c2a3a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af8c2a3a Branch: refs/heads/trunk Commit: af8c2a3ab6ad90a9a9b9815a2c4c781182b65987 Parents: 0d0aed8 4327c29 Author: Tyler Hobbs <[email protected]> Authored: Wed Aug 27 11:03:51 2014 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Wed Aug 27 11:03:51 2014 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/service/StorageService.java | 10 ++++++++++ src/java/org/apache/cassandra/streaming/StreamPlan.java | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/af8c2a3a/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/af8c2a3a/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
