subject:"\[2\/3\] cassandra git commit\: Merge branch 'cassandra\-2.1' into trunk"

[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-04-03 Thread benedict

http://git-wip-us.apache.org/repos/asf/cassandra/blob/23c84b16/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index

[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2015-03-26 Thread tylerhobbs

http://git-wip-us.apache.org/repos/asf/cassandra/blob/8e115dac/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index

[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2014-12-19 Thread benedict

http://git-wip-us.apache.org/repos/asf/cassandra/blob/9a51c3c3/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java -- diff --cc src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java index

[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into trunk

2014-12-15 Thread jmckenzie

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/service/StorageService.java src/java/org/apache/cassandra/utils/FBUtilities.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: