Merge branch 'cassandra-1.1.0' into cassandra-1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/84326c76 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84326c76 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84326c76 Branch: refs/heads/trunk Commit: 84326c761219cc50bb8a260a43e9a6406592bc6b Parents: 9dd2211 0c2d2cc Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Mar 1 18:23:19 2012 -0600 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Mar 1 18:23:19 2012 -0600 ---------------------------------------------------------------------- .../cassandra/hadoop/ColumnFamilyRecordReader.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) ----------------------------------------------------------------------
