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/4191967e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4191967e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4191967e Branch: refs/heads/trunk Commit: 4191967e349b1419218d622daaa478a82e5a1d4b Parents: acbc722 58c9a4c Author: Brandon Williams <brandonwilli...@apache.org> Authored: Sat Sep 13 14:45:00 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Sat Sep 13 14:45:00 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4191967e/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
