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