Merge branch 'cassandra-2.0.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/5d9a33a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d9a33a4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d9a33a4 Branch: refs/heads/trunk Commit: 5d9a33a46c24c5aff9fb3d3497edcd23d7a6c196 Parents: 988aa31 50b40e9 Author: Brandon Williams <[email protected]> Authored: Thu Aug 8 13:03:17 2013 -0500 Committer: Brandon Williams <[email protected]> Committed: Thu Aug 8 13:03:17 2013 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/service/CassandraDaemon.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
