Merge branch 'cassandra-2.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/ac624536 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ac624536 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ac624536 Branch: refs/heads/trunk Commit: ac62453649e1b47ec5a8c8d0a13687c9d7d2c481 Parents: 93f838d 988aa31 Author: Brandon Williams <[email protected]> Authored: Thu Aug 8 13:02:01 2013 -0500 Committer: Brandon Williams <[email protected]> Committed: Thu Aug 8 13:02:01 2013 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/service/StorageService.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ----------------------------------------------------------------------
