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

Merge branch 'cassandra-2.1' into trunk Conflicts: test/unit/org/apache/cassandra/utils/NoSpamLoggerTest.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/47964b76 Tree: http://git-wip-us.apache.org/repos/a

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

Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ea6004e9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ea6004e9 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/db/compaction/CompactionManager.java src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.a

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

Merge branch 'cassandra-2.1' into trunk 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/ce3053a2 Tree: http://git-wip-us.apache.org

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

Merge branch 'cassandra-2.1' into trunk 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/0b4cce86 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b4cce86 Diff: http://git-wip

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

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/db/commitlog/CommitLog.java src/java/org/apache/cassandra/db/commitlog/CommitLogMBean.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/as

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

Merge branch 'cassandra-2.1' into trunk Conflicts: CHANGES.txt NEWS.txt src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategyOptions.java src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java test/unit/org/apache/cassandra/io

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

Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/787a20fd Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/787a20fd Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/99739ee3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/99739ee3 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java src/java/org/apache/cassandra/io/util/CompressedPoolingSegmentedFile.java src/java/org/apache/cassandra/io/util/RandomAccessReader.java s

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

Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f41bac7b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f41bac7b Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

Merge branch 'cassandra-2.1' into trunk Conflicts: src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java src/java/org/apache/cassandra/io/sstable/format/big/BigTableScanner.java Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.

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

Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/24bc6a03 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/24bc6a03 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/32ac6af2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/32ac6af2 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36280a07 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36280a07 Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/371ad9ee Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/371ad9ee Diff: http://git-wip-us.apache.org/repos/asf/cassand

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

Merge branch 'cassandra-2.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/90759185 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/90759185 Diff: http://git-wip-us.apache.org/repos/asf/cassand