Merge branch 'cassandra-1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6fc4b3a6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6fc4b3a6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6fc4b3a6 Branch: refs/heads/trunk Commit: 6fc4b3a64f3705cbe3c379af740b949ba82994af Parents: 789aab1 4f51c70 Author: Jonathan Ellis <[email protected]> Authored: Mon Sep 24 10:47:11 2012 -0500 Committer: Jonathan Ellis <[email protected]> Committed: Mon Sep 24 10:47:11 2012 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
