[7/9] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

2016-07-04 Thread blerer
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/9244531a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9244531a Diff:

[7/9] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2016-06-23 Thread marcuse
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/5ee6e7bc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5ee6e7bc Diff:

[7/9] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2016-04-04 Thread marcuse
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/736a0cef Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/736a0cef Diff:

[7/9] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2016-03-02 Thread marcuse
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/841a8031 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/841a8031 Diff:

[7/9] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2016-01-15 Thread marcuse
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/e0c27bce Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e0c27bce Diff:

[7/9] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-11-27 Thread snazy
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d300a185/test/unit/org/apache/cassandra/cql3/ViewTest.java -- diff --cc test/unit/org/apache/cassandra/cql3/ViewTest.java index ff1ba2f,000..74c6374 mode

[7/9] cassandra git commit: Merge branch cassandra-2.2 into cassandra-3.0

2015-09-22 Thread blerer
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa60cde3/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java --

[7/9] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0

2015-08-24 Thread samt
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/08bfe7f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08bfe7f2 Diff: