[8/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: http://git-wip-us.apache.org/repos/asf

[8/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: http://git-wip-us.apache.org/repos/asf

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

2015-11-27 Thread snazy
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/d300a185 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d300a185 Diff: http://git-wip-us.apache.org/repos/asf

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

2015-09-22 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/aa60cde3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa60cde3 Diff: http://git-wip-us.apache.org/repos/asf/c

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

2015-09-16 Thread snazy
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9218d745/src/java/org/apache/cassandra/service/CacheService.java -- diff --cc src/java/org/apache/cassandra/service/CacheService.java index a48466a,a13a52d..a3e7d12 --- a/src/ja

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

2015-08-25 Thread tylerhobbs
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: CHANGES.txt pylib/cqlshlib/cql3handling.py Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65ee15f9 Tree: http://git-wip-us.apache.org/repos/a

[8/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: http://git-wip-us.apache.org/repos/asf