[1/8] git commit: merge from 1.1

Updated Branches: refs/heads/cassandra-1.0 ec76baf0d -> 4764a379e refs/heads/cassandra-1.1 fa8fc22fc -> de039598f refs/heads/trunk 08b309191 -> f5c19e84a merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/

[1/8] git commit: merge from 1.1

Updated Branches: refs/heads/cassandra-1.1 f9d1f93f0 -> 271405656 refs/heads/trunk 9ecda7230 -> 02308f6f9 merge from 1.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02308f6f Tree: http://git-wip-us.apache.org