Updated Branches: refs/heads/cassandra-1.1 2f4b6d8c6 -> 37067495c refs/heads/cassandra-1.2 041cd867a -> 21f2094c7 refs/heads/cassandra-1.2.0 24cf1d125 -> 93738e312 refs/heads/trunk ba5fe9b33 -> d436aed39
merge from 1.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d436aed3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d436aed3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d436aed3 Branch: refs/heads/trunk Commit: d436aed3907efb03c7fa4b5c00d5c99f4addc291 Parents: ba5fe9b 21f2094 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Nov 28 00:04:37 2012 +0900 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Nov 28 00:04:37 2012 +0900 ---------------------------------------------------------------------- CHANGES.txt | 18 ++++++++++ .../db/columniterator/IColumnIteratorFactory.java | 17 +++++++++ .../db/columniterator/LazyColumnIterator.java | 17 +++++++++ .../cassandra/hadoop/ColumnFamilyInputFormat.java | 27 ++++++++++++++- 4 files changed, 78 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/d436aed3/CHANGES.txt ----------------------------------------------------------------------