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

2017-07-14 Thread bdeggleston
http://git-wip-us.apache.org/repos/asf/cassandra/blob/88d2ac4f/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java -- diff --cc src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java index b4211bb,000..31

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

2017-07-14 Thread blerer
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2445cfb/src/java/org/apache/cassandra/db/filter/DataLimits.java -- diff --cc src/java/org/apache/cassandra/db/filter/DataLimits.java index 94f43dc,000..48ec06a mode 100644,

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

2017-05-31 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/80b79973 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/80b79973 Diff: http://git-wip-us.apache.org/repos/asf/c

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

2016-02-24 Thread jasobrown
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/a6239778 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a6239778 Diff: http://git-wip-us.apache.org/repos/asf

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

2016-02-24 Thread jasobrown
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/d7e0c301 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7e0c301 Diff: http://git-wip-us.apache.org/repos/asf

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

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