Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/707eabdc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/707eabdc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/707eabdc Branch: refs/heads/trunk Commit: 707eabdc9a4d464408629a571086285dd2c9af5d Parents: 1b62f3d 8cb5058 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue May 27 18:12:43 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue May 27 18:12:43 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/707eabdc/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
