[5/8] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9c7a601b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9c7a601b Diff: http://git-wip-us.apache.org/repos/asf

[5/8] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/056f627e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/056f627e Diff: http://git-wip-us.apache.org/repos/asf

[5/8] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/74a5f79a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/74a5f79a Diff: http://git-wip-us.apache.org/repos/asf

[5/8] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/repair/RepairJob.java src/java/org/apache/cassandra/repair/RepairSession.java src/java/org/apache/cassandra/service/ActiveRepairService.java src/java/org/apache/cassandra/servic