Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c749b88e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c749b88e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c749b88e Branch: refs/heads/cassandra-2.1 Commit: c749b88edd95483903f40387577a70ea6c9cb39f Parents: 2d60732 05b2ae8 Author: Brandon Williams <[email protected]> Authored: Wed Apr 2 16:46:55 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Wed Apr 2 16:46:55 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c749b88e/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
