[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb56193a/test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java -- diff --cc test/unit/org/apache/cassandra/cql3/validation/operations/DeleteTest.java index

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0 * cassandra-2.2: Avoid clock skew corrupting other nodes through paxos Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/969f7974 Tree: http://git-wip-us.apache.org/repo

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: src/java/org/apache/cassandra/utils/btree/TreeBuilder.java test/unit/org/apache/cassandra/db/NativeCellTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/as

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0 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/f3c5faba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f3c5faba Diff: http:/

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: test/unit/org/apache/cassandra/db/CommitLogTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e2ad7d56 Tree: http://git-wip-us.apache.org/repos

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: test/unit/org/apache/cassandra/Util.java test/unit/org/apache/cassandra/concurrent/WaitQueueTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra

[09/10] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

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