Merge from 1.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4d55a36a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4d55a36a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4d55a36a Branch: refs/heads/cassandra-1.0 Commit: 4d55a36aa2b94329507f931a3dffbc4c3547bdf0 Parents: 7905044 c98edc3 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Feb 13 16:29:36 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Feb 13 16:29:36 2012 -0600 ---------------------------------------------------------------------- CHANGES.txt | 4 +-- src/java/org/apache/cassandra/db/Table.java | 2 +- .../cassandra/db/compaction/CompactionManager.java | 26 +++++++++----- .../cassandra/hadoop/pig/CassandraStorage.java | 6 ++-- 4 files changed, 22 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4d55a36a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ----------------------------------------------------------------------