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

[slebresne]

Updated Branches:
  refs/heads/trunk d66630d3f -> efa4ae1e5


Merge branch 'cassandra-1.2' into trunk

Conflicts:
        test/unit/org/apache/cassandra/db/KeyCollisionTest.java


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

Branch: refs/heads/trunk
Commit: efa4ae1e5efa6ee42385d9d0211704faddc877f7
Parents: d66630d d4ce7be
Author: Sylvain Lebresne <sylv...@datastax.com>
Authored: Thu Jan 31 12:41:21 2013 +0100
Committer: Sylvain Lebresne <sylv...@datastax.com>
Committed: Thu Jan 31 12:41:21 2013 +0100

----------------------------------------------------------------------
 .../org/apache/cassandra/db/KeyCollisionTest.java  |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/efa4ae1e/test/unit/org/apache/cassandra/db/KeyCollisionTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/KeyCollisionTest.java
index ab792d5,4d86bb7..085534d
--- a/test/unit/org/apache/cassandra/db/KeyCollisionTest.java
+++ b/test/unit/org/apache/cassandra/db/KeyCollisionTest.java
@@@ -27,6 -27,9 +27,8 @@@ import org.junit.Test
  
  import org.apache.cassandra.SchemaLoader;
  import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
 -import org.apache.cassandra.db.filter.QueryPath;
+ import org.apache.cassandra.db.marshal.AbstractType;
+ import org.apache.cassandra.db.marshal.IntegerType;
  import org.apache.cassandra.dht.*;
  import org.apache.cassandra.config.*;
  import org.apache.cassandra.service.StorageService;