Updated Branches:
refs/heads/trunk d8742aa46 -> 845f40733
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/845f4073
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/845f4073
Diff: http://gi
Updated Branches:
refs/heads/trunk 3e1745ae5 -> e9b692586
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/e9b69258
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9b69258
Diff: http://gi