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

2016-07-21 Thread jbellis
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/c7a25972 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7a25972 Diff:

[5/5] 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/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2

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

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

2015-06-18 Thread jake
Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/70d0d5f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70d0d5f2 Diff:

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

2015-06-02 Thread slebresne
Merge branch 'cassandra-2.1' into cassandra-2.2 Conflicts: src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a30d8bd2 Tree:

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

2015-05-27 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/80ba11c6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/80ba11c6 Diff: