Updated Branches: refs/heads/trunk 94e4ace75 -> 5d8ba3d3b
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/5d8ba3d3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5d8ba3d3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5d8ba3d3 Branch: refs/heads/trunk Commit: 5d8ba3d3b4b76aa06a8e80abe017e43c0074444b Parents: 94e4ace 5c91bd1 Author: Pavel Yaskevich <xe...@apache.org> Authored: Tue Sep 4 14:39:41 2012 +0300 Committer: Pavel Yaskevich <xe...@apache.org> Committed: Tue Sep 4 14:39:41 2012 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/cql3/CFPropDefs.java | 11 +++++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d8ba3d3/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/5d8ba3d3/src/java/org/apache/cassandra/cql3/CFPropDefs.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/cql3/CFPropDefs.java index bc0ba04,01e14fb..db85522 --- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java +++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java @@@ -20,7 -21,11 +20,8 @@@ package org.apache.cassandra.cql3 import com.google.common.collect.Sets; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ConfigurationException; -import org.apache.cassandra.db.compaction.AbstractCompactionStrategy; -import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.marshal.TypeParser; import org.apache.cassandra.io.compress.CompressionParameters; -import org.apache.cassandra.thrift.InvalidRequestException; ++import org.apache.cassandra.db.compaction.AbstractCompactionStrategy; import org.slf4j.Logger; import org.slf4j.LoggerFactory;
