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/54c424d6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54c424d6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/54c424d6 Branch: refs/heads/trunk Commit: 54c424d6abb035fbdc255dfc9d64c0c4dfed2284 Parents: 4697318 a2c91d7 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Aug 1 13:56:55 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Aug 1 13:56:55 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------