You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2012/02/13 23:39:08 UTC
[3/12] git commit: Merge from 1.1
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/trunk
Commit: 4d55a36aa2b94329507f931a3dffbc4c3547bdf0
Parents: 7905044 c98edc3
Author: Brandon Williams <br...@apache.org>
Authored: Mon Feb 13 16:29:36 2012 -0600
Committer: Brandon Williams <br...@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
----------------------------------------------------------------------