[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/76508213 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76508213 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/7932119d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7932119d Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/6ce04564 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6ce04564 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/de4ee0bb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de4ee0bb Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/bd692ba7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bd692ba7 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/fd40a618 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fd40a618 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/8d494c78 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d494c78 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/d4ac8d59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d4ac8d59 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/2ea11c16 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ea11c16 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/5549680e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5549680e Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/54fbb0ab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/54fbb0ab Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/8a69ef89 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8a69ef89 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/1040b520 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1040b520 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/6a7235e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a7235e9 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/25c335f7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/25c335f7 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/3060ccc9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3060ccc9 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/d9b463ef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9b463ef Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/50ee3a70 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/50ee3a70 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/334969fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/334969fd Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/tools/SSTableExport.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ddda5414 Tree:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/e6602f76 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6602f76 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/077d3ce7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/077d3ce7 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/8d06dd10 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d06dd10 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/5f0413be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5f0413be Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/63407db7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/63407db7 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/93942bad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/93942bad Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/8d6b7326 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8d6b7326 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/db962390 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/db962390 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/ee180495 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ee180495 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/8081c54c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8081c54c Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/e0b88878 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0b88878 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/89842578 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/89842578 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/04944f0c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04944f0c Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/59a8504c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59a8504c Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/a0bfdebc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0bfdebc Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/27747583 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27747583 Diff:

[3/4] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1

Merge branch 'cassandra-2.1.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/d677e790 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d677e790 Diff: