Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7ab241e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7ab241e9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7ab241e9 Branch: refs/heads/trunk Commit: 7ab241e969dcc0e327e87d4ed0a43bc6af428795 Parents: 012de8b 88b05ef Author: Joshua McKenzie <jmcken...@apache.org> Authored: Wed Aug 26 17:16:22 2015 -0400 Committer: Joshua McKenzie <jmcken...@apache.org> Committed: Wed Aug 26 17:16:22 2015 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ----------------------------------------------------------------------
