[6/7] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

Merge branch 'cassandra-1.1' 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/2ef11b4b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ef11b4b Diff: http://git-wip-us.apache.org/repos/asf

[6/7] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

Merge branch 'cassandra-1.1' into cassandra-1.2 Conflicts: src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c67e501f Tree: http://git-wip-us.ap

[6/7] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2

Merge branch 'cassandra-1.1' 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/7e1e0767 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7e1e0767 Diff: http://git-wip-us.apache.org/repos/asf