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/f1db1afe Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f1db1afe Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f1db1afe Branch: refs/heads/trunk Commit: f1db1afe9ca95791fe4cb6676cab42d6b2674518 Parents: 237d0bc bbb3fc7 Author: Tyler Hobbs <[email protected]> Authored: Fri Mar 20 11:44:39 2015 -0500 Committer: Tyler Hobbs <[email protected]> Committed: Fri Mar 20 11:44:39 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ src/java/org/apache/cassandra/service/StorageService.java | 9 ++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1db1afe/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f1db1afe/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
