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/05d4d3aa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/05d4d3aa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/05d4d3aa Branch: refs/heads/trunk Commit: 05d4d3aaf954c00de422309a52369d885592f344 Parents: e12840e 5bd78ed Author: Pavel Yaskevich <[email protected]> Authored: Tue Mar 27 23:11:22 2012 +0300 Committer: Pavel Yaskevich <[email protected]> Committed: Tue Mar 27 23:11:22 2012 +0300 ---------------------------------------------------------------------- ----------------------------------------------------------------------
