Updated Branches: refs/heads/cassandra-1.1 211bc0ca3 -> ac21a555c refs/heads/cassandra-1.1.0 483a69992 -> b184972b0 refs/heads/trunk 3699a2de0 -> c9759116f
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/c9759116 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c9759116 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c9759116 Branch: refs/heads/trunk Commit: c9759116f1a4adaa1f601b7ab13b4eeb4f602700 Parents: 3699a2d ac21a55 Author: Jonathan Ellis <jbel...@apache.org> Authored: Mon Apr 16 16:24:16 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Mon Apr 16 16:24:16 2012 -0500 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../cassandra/hadoop/ColumnFamilyRecordReader.java | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9759116/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c9759116/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java ----------------------------------------------------------------------
