merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/40bc4456 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40bc4456 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/40bc4456 Branch: refs/heads/trunk Commit: 40bc4456fa0228e8a78c6f6edab0b02c38c14389 Parents: a684ee0 81619fe Author: Jonathan Ellis <[email protected]> Authored: Mon Jun 24 18:09:12 2013 -0700 Committer: Jonathan Ellis <[email protected]> Committed: Mon Jun 24 18:09:12 2013 -0700 ---------------------------------------------------------------------- ----------------------------------------------------------------------
