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/9de8d3ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9de8d3ef Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9de8d3ef Branch: refs/heads/trunk Commit: 9de8d3ef59637b1001483ce20845e81b7cfeaf97 Parents: f2a656e 2800c7f Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Jun 3 10:35:33 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Jun 3 10:35:33 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
