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/8cb50583 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8cb50583 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8cb50583 Branch: refs/heads/trunk Commit: 8cb50583d42e672d4897061cec53345f9f7839a7 Parents: 86b6ec5 81286b0 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue May 27 18:12:34 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue May 27 18:12:34 2014 -0500 ---------------------------------------------------------------------- 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/8cb50583/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
