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/c9f4f0d6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9f4f0d6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9f4f0d6 Branch: refs/heads/trunk Commit: c9f4f0d644076875b970b2cfc666e00225314fb4 Parents: 1daf191 08c07f5 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Sep 13 12:18:41 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Sep 13 12:18:41 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9f4f0d6/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
