Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e911b767 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e911b767 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e911b767 Branch: refs/heads/trunk Commit: e911b767e1ca90acbb4be65475a239b4a663308f Parents: b5f445b 5d9a33a Author: Jonathan Ellis <[email protected]> Authored: Thu Aug 8 15:52:07 2013 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Aug 8 15:52:07 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/service/CassandraDaemon.java | 14 ++------------ .../org/apache/cassandra/service/StorageService.java | 5 +---- 2 files changed, 3 insertions(+), 16 deletions(-) ----------------------------------------------------------------------
