Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90d2f8e8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90d2f8e8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/90d2f8e8 Branch: refs/heads/trunk Commit: 90d2f8e8ec4a23b124760ebbf93926478bd76ae6 Parents: e6e846c 228d1cf Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Nov 13 20:13:13 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Nov 13 20:13:13 2012 +0100 ---------------------------------------------------------------------- .../apache/cassandra/service/CassandraDaemon.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
