Merge branch 'cassandra-1.1' into cassandra-1.2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99c83388 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99c83388 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/99c83388 Branch: refs/heads/cassandra-1.2.0 Commit: 99c833886cea4512069f14c47ef59c8aceb641f8 Parents: 5a90123 5abeecc Author: Brandon Williams <brandonwilli...@apache.org> Authored: Wed Dec 5 14:25:42 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Wed Dec 5 14:25:42 2012 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------