merge from 1.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f6ba989f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f6ba989f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f6ba989f Branch: refs/heads/trunk Commit: f6ba989f9a5d65474b82b44450d6a35a9634c924 Parents: 86d7c84 f7629d8 Author: Jonathan Ellis <[email protected]> Authored: Tue Feb 28 10:35:00 2012 -0600 Committer: Jonathan Ellis <[email protected]> Committed: Tue Feb 28 10:35:00 2012 -0600 ---------------------------------------------------------------------- ----------------------------------------------------------------------
