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

[4/6] 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/9aff086a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9aff086a Diff: http://git-wip-us.apache.org/repos/a

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

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

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

[4/6] 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/5aee1288 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5aee1288 Diff: http://git-wip-us.apache.org/repos/a

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

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: test/unit/org/apache/cassandra/tools/SSTableImportTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/141b9399 Tree: http://git-wip-us.apache.

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

[4/6] 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/579a853d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/579a853d Diff: http://git-wip-us.apache.org/repos/a

[4/6] 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/821a2fe0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/821a2fe0 Diff: http://git-wip-us.apache.org/repos/a

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

[4/6] 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/1c1a40e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1c1a40e1 Diff: http://git-wip-us.apache.org/repos/a

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

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

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

[4/6] 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/107f5ba9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/107f5ba9 Diff: http://git-wip-us.apache.org/repos/a

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

Merge branch 'cassandra-2.1.0' into cassandra-2.1 Conflicts: bin/cqlsh Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f9fc846e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f9fc846e Diff: http:/

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

[4/6] 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/1366c0ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1366c0ad Diff: http://git-wip-us.apache.org/repos/a

[4/6] 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/0396efc4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0396efc4 Diff: http://git-wip-us.apache.org/repos/a

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

[4/6] 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/40fd7f01 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/40fd7f01 Diff: http://git-wip-us.apache.org/repos/a

[4/6] 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/8571fb57 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8571fb57 Diff: http://git-wip-us.apache.org/repos/a

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

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

[4/6] 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/5c856997 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c856997 Diff: http://git-wip-us.apache.org/repos/a