Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0a8f4bab Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0a8f4bab Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0a8f4bab Branch: refs/heads/trunk Commit: 0a8f4bab76ac9ab57e79e20b0fdc4f2d0b3b8bfc Parents: 6c37934 74d63ba Author: Jonathan Ellis <jbel...@apache.org> Authored: Sun Oct 20 00:22:51 2013 +0100 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Sun Oct 20 00:22:51 2013 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + NEWS.txt | 1 + .../org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java | 3 +++ .../org/apache/cassandra/io/util/CompressedSegmentedFile.java | 1 + src/java/org/apache/cassandra/io/util/Memory.java | 1 + 5 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a8f4bab/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0a8f4bab/NEWS.txt ----------------------------------------------------------------------
