cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [2/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Date Wed, 05 Nov 2014 17:35:33 GMT
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java


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

Branch: refs/heads/trunk
Commit: 82b91aba697db1a61bbee134b89667a59b3a6b2b
Parents: 40ba9fe 89257bc
Author: Aleksey Yeschenko <aleksey@apache.org>
Authored: Wed Nov 5 20:35:08 2014 +0300
Committer: Aleksey Yeschenko <aleksey@apache.org>
Committed: Wed Nov 5 20:35:08 2014 +0300

----------------------------------------------------------------------
 .../cql3/statements/CreateTableStatement.java   | 11 --------
 .../db/ColumnFamilyNotDefinedException.java     | 28 --------------------
 2 files changed, 39 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/82b91aba/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
index 44b187d,5160d6f..672bb50
--- a/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
@@@ -37,8 -36,7 +37,7 @@@ import org.apache.cassandra.exceptions.
  import org.apache.cassandra.io.compress.CompressionParameters;
  import org.apache.cassandra.service.ClientState;
  import org.apache.cassandra.service.MigrationManager;
- import org.apache.cassandra.thrift.CqlResult;
 -import org.apache.cassandra.transport.messages.ResultMessage;
 +import org.apache.cassandra.transport.Event;
  import org.apache.cassandra.utils.ByteBufferUtil;
  
  /** A <code>CREATE TABLE</code> parsed from a CQL query statement. */


Mime
View raw message