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/59a36304 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/59a36304 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/59a36304 Branch: refs/heads/cassandra-1.1 Commit: 59a36304c4a026ead160b53c02086b67a457e921 Parents: 8a45c6c d760706 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Tue Feb 21 08:04:13 2012 -0600 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Tue Feb 21 08:04:13 2012 -0600 ---------------------------------------------------------------------- .../cassandra/hadoop/pig/CassandraStorage.java | 31 ++++++++++---- .../cassandra/db/compaction/CompactionsTest.java | 8 ++- 2 files changed, 27 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/59a36304/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ----------------------------------------------------------------------
