Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/303702d4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/303702d4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/303702d4 Branch: refs/heads/trunk Commit: 303702d4449eaa5a89b5b4d49649aa9956aab524 Parents: d9a03a0 db275f4 Author: Brandon Williams <[email protected]> Authored: Fri Oct 18 14:48:24 2013 -0500 Committer: Brandon Williams <[email protected]> Committed: Fri Oct 18 14:48:24 2013 -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/303702d4/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
