Merge branch 'cassandra-1.2.0' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/21f2094c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/21f2094c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/21f2094c Branch: refs/heads/trunk Commit: 21f2094c7dc93b1d800227d17d7b2d13ceaacb74 Parents: 041cd86 93738e3 Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed Nov 28 00:03:51 2012 +0900 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Wed Nov 28 00:03:51 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/21f2094c/CHANGES.txt ----------------------------------------------------------------------