Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1df03b36 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1df03b36 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1df03b36 Branch: refs/heads/trunk Commit: 1df03b36df1e5ae9f69657ee12ee8e79ccf2a87e Parents: b8d8802 49cb690 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Jan 4 06:39:45 2013 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Jan 4 06:39:45 2013 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------