Merge branch 'cassandra-1.2' of https://git-wip-us.apache.org/repos/asf/cassandra 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/2828d28e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2828d28e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2828d28e Branch: refs/heads/trunk Commit: 2828d28eb40454ed81cbfb1d3df49d0fadaf043d Parents: fdec45f bdf9c2a Author: Brandon Williams <brandonwilli...@apache.org> Authored: Fri Dec 7 17:30:19 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Fri Dec 7 17:30:19 2012 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------