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/6990f95b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6990f95b
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/1273476f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1273476f
Diff: http://git-wip-us.apache.org/repos/asf/cassand