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

2014-09-08 Thread benedict
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:

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

2014-09-06 Thread mishail
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:

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

2014-09-06 Thread mishail
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:

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

2014-09-05 Thread brandonwilliams
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:

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

2014-09-04 Thread mishail
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:

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

2014-08-20 Thread benedict
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:

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

2014-08-15 Thread mishail
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:

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

2014-08-14 Thread yukim
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:

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

2014-08-06 Thread brandonwilliams
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:

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

2014-08-06 Thread brandonwilliams
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:

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

2014-08-06 Thread jbellis
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:

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

2014-08-04 Thread mishail
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:

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

2014-08-01 Thread brandonwilliams
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:

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

2014-07-31 Thread jbellis
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:

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

2014-07-25 Thread yukim
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:

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

2014-07-25 Thread brandonwilliams
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:

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

2014-07-23 Thread brandonwilliams
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:

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

2014-07-15 Thread jbellis
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:

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

2014-07-15 Thread jbellis
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:

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

2014-07-14 Thread jbellis
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:

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

2014-07-10 Thread brandonwilliams
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:

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

2014-07-09 Thread brandonwilliams
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:

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

2014-07-08 Thread jbellis
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:

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

2014-07-07 Thread benedict
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:

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

2014-07-06 Thread jbellis
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:

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

2014-06-30 Thread benedict
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: