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/64a3e726 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/64a3e726 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/64a3e726 Branch: refs/heads/trunk Commit: 64a3e7265b77c41408f8eafaccc3ef093c39eadd Parents: f6a7a5b 52e1def Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jan 31 06:47:28 2014 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jan 31 06:47:28 2014 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/64a3e726/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
