[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/de2c449b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/de2c449b Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02f48c86 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02f48c86 Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a846e6f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a846e6f Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/15fd71f9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/15fd71f9 Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02ebf875 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02ebf875 Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 * cassandra-3.0: Ninja-fix test build Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4805108d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4805108d

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 * cassandra-3.0: NullPointerException during compaction on table with static columns Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21c92cab Tree:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/042e1f76 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/042e1f76 Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 * cassandra-3.0: Super columns are broken after upgrading to 3.0 on thrift Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1323ad0f Tree:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/245fc2ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/245fc2ad Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fb6f958 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fb6f958 Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 * cassandra-3.0: Rerun ReplicationAwareTokenAllocatorTest on failure to avoid flakiness. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68b3f6e7 Tree:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 * cassandra-3.0: Lost counter writes in compact table and static columns Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f0fd9ad6 Tree:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d22e3908 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d22e3908 Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04a0c00f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04a0c00f Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 * cassandra-3.0: AssertionError with MVs on updating a row that isn't indexed due to a null value Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9e6a0d4 Tree:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/67909ea8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/67909ea8 Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/79fbdbe6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79fbdbe6 Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5e111e64 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e111e64 Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 * cassandra-3.0: NullPointerExpception when reading/compacting table Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/43d726be Tree:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4bd4be86 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4bd4be86 Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 * cassandra-3.0: Fix problem with undeleteable rows on upgrade to new sstable format. Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d4ced245 Tree:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/371a1479 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/371a1479 Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/314f60a4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/314f60a4 Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5ad17634 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ad17634 Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/237330ad Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/237330ad Diff:

[4/6] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.9

Merge branch cassandra-3.0 into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/118f1a0d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/118f1a0d Diff:

[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

Merge branch 'cassandra-3.0' into cassandra-3.9 * cassandra-3.0: Exclude static columns from digest on empty static row Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3dceaaba Tree: