Merge branch 'cassandra-1.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/59a36304
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59a36304
Diff: http://git-wip-us.apache.org/repos/asf/cassand
Merge branch 'cassandra-1.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26e80d74
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26e80d74
Diff: http://git-wip-us.apache.org/repos/asf/cassand