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/e1e91beb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e1e91beb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e1e91beb Branch: refs/heads/trunk Commit: e1e91bebdf4a2aa457d53b3a1c5c95b252b4f98b Parents: 05a4575 da2acdd Author: Brandon Williams <[email protected]> Authored: Tue Apr 8 14:42:52 2014 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Apr 8 14:42:52 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e1e91beb/src/java/org/apache/cassandra/service/StorageService.java ----------------------------------------------------------------------
