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