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/fef40a5a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fef40a5a
Diff: http://git-wip-us.apache.org/repos/asf/cassand
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/cf52eae5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cf52eae5
Diff: http://git-wip-us.apache.org/repos/asf/cassand