Updated Branches: refs/heads/cassandra-1.1 9dd221102 -> 84326c761 refs/heads/cassandra-1.1.0 f22b223bb -> 0c2d2ccd9 refs/heads/trunk 3d5529d47 -> f42ebd0c4
Merge branch 'cassandra-1.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/f42ebd0c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f42ebd0c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f42ebd0c Branch: refs/heads/trunk Commit: f42ebd0c4ffe342dccbd38e16c398d0d75e22692 Parents: 3d5529d 84326c7 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Mar 1 18:23:35 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Mar 1 18:23:35 2012 -0600 ---------------------------------------------------------------------- .../cassandra/hadoop/ColumnFamilyRecordReader.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f42ebd0c/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java ----------------------------------------------------------------------
