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

2018-08-02 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/3acb7d44 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3acb7d44 Diff:

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

2018-07-02 Thread mshuler
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/af2bad81 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af2bad81 Diff:

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

2017-07-14 Thread bdeggleston
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/88d2ac4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88d2ac4f Diff:

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

2017-05-10 Thread adelapena
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/aa181927 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/aa181927 Diff:

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

2017-04-07 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/833c993b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/833c993b Diff:

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

2017-02-14 Thread aleksey
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/76ad028f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76ad028f Diff:

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

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

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

2016-05-26 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/764f3d3a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/764f3d3a Diff:

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

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

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

2016-03-18 Thread slebresne
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/1dbfa4b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1dbfa4b5 Diff:

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

2016-03-02 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/841a8031 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/841a8031 Diff:

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

2015-09-22 Thread blerer
http://git-wip-us.apache.org/repos/asf/cassandra/blob/aa60cde3/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index