[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-05 Thread tylerhobbs
Merge branch 'cassandra-3.0' into cassandra-3.9 Conflicts: CHANGES.txt src/java/org/apache/cassandra/db/ReadResponse.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32825a9b Tree: http://git-wip-u

[2/2] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.9

2016-07-14 Thread blerer
Merge branch cassandra-3.0 into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/fb4eb5ac Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/fb4eb5ac Diff: http://git-wip-us.apache.org/repos/asf/c

[2/2] cassandra git commit: Merge branch cassandra-3.0 into cassandra-3.9

2016-07-14 Thread blerer
Merge branch cassandra-3.0 into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2764e85a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2764e85a Diff: http://git-wip-us.apache.org/repos/asf/c

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-15 Thread tylerhobbs
Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/136f6b1c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/136f6b1c Diff: http://git-wip-us.apache.org/repos/asf

[2/2] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.9

2016-07-20 Thread tylerhobbs
Merge branch 'cassandra-3.0' into cassandra-3.9 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7fbe42a5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7fbe42a5 Diff: http://git-wip-us.apache.org/repos/asf