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/4e0656b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e0656b0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e0656b0 Branch: refs/heads/trunk Commit: 4e0656b0bb67ff0fad2938802bec263b8e6e09aa Parents: 1e13cbf b93f287 Author: Jonathan Ellis <[email protected]> Authored: Thu Jun 12 20:43:07 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Jun 12 20:43:07 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
