Merge branch 'cassandra-2.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/11827f0d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11827f0d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/11827f0d Branch: refs/heads/trunk Commit: 11827f0d7e0d50565f276a7aefe9a88873529ba7 Parents: c073fab 205b661 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Apr 24 10:22:37 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Apr 24 10:22:37 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------