Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21e6ec6d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21e6ec6d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21e6ec6d Branch: refs/heads/cassandra-2.0 Commit: 21e6ec6d81b76be762199f59650f97876133544f Parents: 22e67be 9eddaa8 Author: Brandon Williams <[email protected]> Authored: Thu Oct 24 09:56:58 2013 -0500 Committer: Brandon Williams <[email protected]> Committed: Thu Oct 24 09:56:58 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/21e6ec6d/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
