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