Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c9798680
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9798680
Diff: http://git-wip-us.apache.org/repos/asf/cassand
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76acc804
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76acc804
Diff: http://git-wip-us.apache.org/repos/asf/cassand