[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/dc79a865 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/dc79a865 Diff: http:/

[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fe7a7a7f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fe7a7a7f Diff: http://git-wip-us.apache.org/repos/asf

[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/58599a9a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/58599a9a Diff: http://git-wip-us.apache.org/repos/asf

[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca2f0223 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca2f0223 Diff: http:/

[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ca40d11c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ca40d11c Diff: http://git-wip-us.apache.org/repos/asf

[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7473877e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7473877e Diff: http://git-wip-us.apache.org/repos/asf

[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/service/CassandraDaemon.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/374ef3c7 Tree: http://g

[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt src/java/org/apache/cassandra/cql3/ResultSet.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/83944f82 Tree: http://git-wip-us

[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/212a2c19 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/212a2c19 Diff: http://git-wip-us.apache.org/repos/asf

[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/14a33247 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/14a33247 Diff: http:/

[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/434d27b8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/434d27b8 Diff: http://git-wip-us.apache.org/repos/asf

[07/10] cassandra git commit: Merge branch 'cassandra-2.0' into cassandra-2.1

Merge branch 'cassandra-2.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4e269111 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e269111 Diff: http://git-wip-us.apache.org/repos/asf