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: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5001e982 Branch: refs/heads/trunk Commit: 5001e982a6543562de65f5c935eb0c80d30605b8 Parents: 33c5e19 5b8ac8c Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Jun 24 13:08:50 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Jun 24 13:08:50 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------