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/71142cac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71142cac Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71142cac Branch: refs/heads/trunk Commit: 71142cac81d58da035c74604062474117bbec1f0 Parents: c709d98 a31441f Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Aug 4 12:20:56 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Aug 4 12:20:56 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------