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/82211f69 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/82211f69 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/82211f69 Branch: refs/heads/trunk Commit: 82211f6987e58c2d74283252a0c6297ab57b3272 Parents: 2827af4 6b47853 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Jul 29 13:59:18 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Jul 29 13:59:18 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------