subject:"\[10\/12\] cassandra git commit\: Merge branch 'cassandra\-2.2' into cassandra\-3.0"

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

2016-08-16 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/bb56193a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb56193a Diff:

[10/12] 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/ffd6bab3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffd6bab3 Diff:

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

2015-09-24 Thread jmckenzie

Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: src/java/org/apache/cassandra/service/StorageService.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5d918b8f Tree: