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

2017-09-15 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/45218f91 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/45218f91 Diff:

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

2016-11-18 Thread blambov
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb41380c/test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java -- diff --cc test/unit/org/apache/cassandra/db/compaction/CompactionsPurgeTest.java index

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

2016-03-22 Thread yukim
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/842e7c3f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/842e7c3f Diff:

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

2016-01-13 Thread carl
http://git-wip-us.apache.org/repos/asf/cassandra/blob/94e7ef17/src/java/org/apache/cassandra/service/StorageProxy.java -- diff --cc src/java/org/apache/cassandra/service/StorageProxy.java index e2fa270,841e980..89ac0bb ---