Updated Branches: refs/heads/trunk 191c96f1d -> 1650ae8f6
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1650ae8f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1650ae8f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1650ae8f Branch: refs/heads/trunk Commit: 1650ae8f6ff08ba89c2b0f8b523a87dc7bad06bf Parents: 191c96f 90d2f8e Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Nov 13 20:13:44 2012 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Nov 13 20:13:44 2012 +0100 ---------------------------------------------------------------------- .../apache/cassandra/service/CassandraDaemon.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
