Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/97a43fff
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/97a43fff
Diff:
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c08aaf69
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c08aaf69
Diff: