[09/10] 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/dht/RangeStreamer.java src/java/org/apache/cassandra/repair/StreamingRepairTask.java src/java/org/apache/cassandra/service/StorageService.java src/java/org/a

[09/10] 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/4b2e946f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b2e946f Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/9a6298e2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9a6298e2 Diff: http://git-wip-us.apache.org/repos/asf

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

Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: pylib/cqlshlib/formatting.py Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0cdf2b3f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0cdf

[09/10] 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/c4e09469 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4e09469 Diff: http://git-wip-us.apache.org/repos/asf

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

Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: src/java/org/apache/cassandra/db/Memtable.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/03f76a9c Tree: http://git-wip-us.apache.org/repos/asf/c

[09/10] 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/197d4394 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/197d4394 Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/b4b3d801 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b4b3d801 Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/6c8271f6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6c8271f6 Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/9adb31ca Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9adb31ca Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/fbe4df5e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fbe4df5e Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/8cb50583 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8cb50583 Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/a0d096b0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a0d096b0 Diff: http:/

[09/10] 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/07dfb58a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07dfb58a Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/baee086f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/baee086f Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/8939ac49 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8939ac49 Diff: http:/

[09/10] 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/ece38643 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ece38643 Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/11827f0d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/11827f0d Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/c531f537 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c531f537 Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/477a0a28 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/477a0a28 Diff: http:/

[09/10] 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/da2acdd6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/da2acdd6 Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/ffc8dae6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffc8dae6 Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/d71b59e6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d71b59e6 Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/4717d276 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4717d276 Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/0ccee7f5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0ccee7f5 Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/ceddff58 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ceddff58 Diff: http:/

[09/10] 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/bbad16b7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bbad16b7 Diff: http:/

[09/10] 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/0508a155 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0508a155 Diff: http://git-wip-us.apache.org/repos/asf

[09/10] 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/ddaddf63 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ddaddf63 Diff: http://git-wip-us.apache.org/repos/asf