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/1e13cbf8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1e13cbf8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1e13cbf8 Branch: refs/heads/trunk Commit: 1e13cbf8499de113246ac99bef5db27e86e18294 Parents: b9153f4 53c95eb Author: Brandon Williams <[email protected]> Authored: Thu Jun 12 17:33:26 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Thu Jun 12 17:33:26 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/1e13cbf8/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
