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/75023593 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/75023593 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/75023593 Branch: refs/heads/trunk Commit: 750235931490f1a2bfd5309f5357a3f8ac2a4fcf Parents: 1ac72f6 d13f78a Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu May 8 17:04:28 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu May 8 17:04:28 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------