[2/2] git commit: Merge branch 'cassandra-1.2' into trunk

[aleksey]

Merge branch 'cassandra-1.2' into trunk

Conflicts:
        CHANGES.txt
        src/java/org/apache/cassandra/cql3/Constants.java


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/84d1aaae
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/84d1aaae
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/84d1aaae

Branch: refs/heads/trunk
Commit: 84d1aaaea7344b1cfe125b431e48224dc20e4447
Parents: 68fa88d 01d4f07
Author: Aleksey Yeschenko <alek...@apache.org>
Authored: Tue Jun 11 01:12:02 2013 +0300
Committer: Aleksey Yeschenko <alek...@apache.org>
Committed: Tue Jun 11 01:12:02 2013 +0300

----------------------------------------------------------------------
 CHANGES.txt                                       | 2 ++
 src/java/org/apache/cassandra/cql3/Constants.java | 9 +++------
 2 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/84d1aaae/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/84d1aaae/src/java/org/apache/cassandra/cql3/Constants.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/Constants.java
index 3cdcb46,4c9d856..0580413
--- a/src/java/org/apache/cassandra/cql3/Constants.java
+++ b/src/java/org/apache/cassandra/cql3/Constants.java
@@@ -24,12 -24,8 +24,7 @@@ import org.slf4j.Logger
  import org.slf4j.LoggerFactory;
  
  import org.apache.cassandra.db.ColumnFamily;
- import org.apache.cassandra.db.marshal.AbstractType;
- import org.apache.cassandra.db.marshal.BytesType;
- import org.apache.cassandra.db.marshal.CollectionType;
- import org.apache.cassandra.db.marshal.CounterColumnType;
- import org.apache.cassandra.db.marshal.LongType;
- import org.apache.cassandra.db.marshal.MarshalException;
 -import org.apache.cassandra.db.filter.QueryPath;
+ import org.apache.cassandra.db.marshal.*;
  import org.apache.cassandra.exceptions.InvalidRequestException;
  import org.apache.cassandra.utils.ByteBufferUtil;