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

2016-06-23 Thread marcuse
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/225232a9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/225232a9 Diff:

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

2015-11-27 Thread snazy
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b3e6a433 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b3e6a433 Diff:

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

2015-09-16 Thread snazy
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e63dacf7/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java index

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

2015-08-25 Thread tylerhobbs
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d526536f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d526536f Diff:

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

2015-05-19 Thread samt
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e2723a40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e2723a40 Diff: