Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3dad8ca6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3dad8ca6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3dad8ca6 Branch: refs/heads/cassandra-2.1 Commit: 3dad8ca60c14a6c57a1a2830310b14d50d36b0c0 Parents: de720b4 0547d16 Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Apr 22 09:17:31 2014 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Apr 22 09:17:31 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
