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://git-wip-us.apache.org/repos/asf/cassandra/diff/6b47853d
Branch: refs/heads/cassandra-2.1
Commit: 6b47853d5a1064ae0742237c0d4ac8766d8c2a6f
Parents: a5bc52e 90c81c7
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Tue Jul 29 13:59:09 2014 -0500
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Tue Jul 29 13:59:09 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
