Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/655d517b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/655d517b
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Conflicts:
debian/init
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4dc3a6e3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4dc3a6e3
Diff: http
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90c81c78
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90c81c78
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/df7bd7f7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/df7bd7f7
Diff: http://git-wip-us.apache.org/repos/a
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/545e2e1c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/545e2e1c
Diff: http://git-wip-us.apache.org/repos/a