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/7c2e49e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7c2e49e2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7c2e49e2 Branch: refs/heads/trunk Commit: 7c2e49e220d028649720ea7883e0a3ad28aaa185 Parents: 39dd855 48438ff Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon May 21 11:25:27 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon May 21 11:25:27 2012 -0500 ---------------------------------------------------------------------- ----------------------------------------------------------------------
