Merge branch 'cassandra-2.1.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/7d84043e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7d84043e
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-2.1.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/a15e11ab
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a15e11ab
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-2.1.0' into cassandra-2.1
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/6b47853d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6b47853d
Diff: http
Merge branch 'cassandra-2.1.0' into cassandra-2.1
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/3b14f6a5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3b14f6a5
Diff: http
Merge branch 'cassandra-2.1.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/367a3696
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/367a3696
Diff: http://git-wip-us.apache.org/repos/a