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/0dbb4e02 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0dbb4e02 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0dbb4e02 Branch: refs/heads/cassandra-2.0 Commit: 0dbb4e0283de93a60817aed123ad47dc9596f06a Parents: c54958a f727381 Author: Jonathan Ellis <[email protected]> Authored: Sat Jun 7 08:21:44 2014 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Sat Jun 7 08:21:44 2014 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
