[16/16] git commit: Merge branch 'cassandra-2.1' into trunk

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

[16/16] git commit: Merge branch 'cassandra-2.1' into trunk

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