[2/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/31d5193a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/31d5193a Diff: http:/

[2/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: src/java/org/apache/cassandra/locator/SimpleSeedProvider.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d5d1adb4 Tree: http://git-wip-us.apache.

[2/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

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

[2/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

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

[2/6] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0

Merge branch 'cassandra-1.2' into cassandra-2.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47fcb05d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/47fcb05d Diff: http:/