Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f810690a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f810690a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f810690a Branch: refs/heads/cassandra-2.0.0 Commit: f810690a5da97f0d5c9f18fadc5b027a5390dc73 Parents: 4b4ccc3 bcfe352 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Aug 5 16:57:41 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Aug 5 16:57:41 2013 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------