Updated Branches: refs/heads/cassandra-1.1 65b09c8c9 -> 8128119a0 refs/heads/trunk 67e4fdb43 -> 1ecd9b7e9
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/1ecd9b7e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1ecd9b7e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1ecd9b7e Branch: refs/heads/trunk Commit: 1ecd9b7e9dd472705c5eeec7dfadccc87f879a16 Parents: 67e4fdb 8128119 Author: Brandon Williams <[email protected]> Authored: Thu Jun 21 14:43:10 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Thu Jun 21 14:43:10 2012 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/ColumnFamilyRecordReader.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1ecd9b7e/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java ----------------------------------------------------------------------
