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/c18e740c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c18e740c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c18e740c Branch: refs/heads/cassandra-2.1 Commit: c18e740c8d26798c70cc1145f9ddea6ac505d7b1 Parents: e8500c7 900f29c Author: Jonathan Ellis <[email protected]> Authored: Thu Jun 26 19:18:52 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Thu Jun 26 19:18:52 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
