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/432b7319 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/432b7319 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/432b7319 Branch: refs/heads/trunk Commit: 432b7319bfa8546811eefad687ce411f7c895499 Parents: 1dea983 96f433d Author: Brandon Williams <brandonwilli...@apache.org> Authored: Thu Oct 16 11:42:58 2014 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Thu Oct 16 11:42:58 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------