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

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/repair/StreamingRepairTask.java src/java/org/apache/cassandra/streaming/StreamCoordinator.java src/java/org/apache/cassandra/streaming/StreamSession.java test/unit/org/apache/cassandra/

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

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

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

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

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

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/streaming/StreamReceiveTask.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c158efdf Tree: http://git-wip-us.apache.org/rep

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3732209 Tree: http://git-wip-us.apache.org/repos/as

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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