Merge branch 'cassandra-1.2' into trunk
Conflicts:
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/c00c24cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c00c24cb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c00c24cb
Branch: refs/heads/trunk
Commit: c00c24cb4efbd954e72ef1ce0324beaf46922e54
Parents: 2130b2e 1a45fcb
Author: Aleksey Yeschenko <[email protected]>
Authored: Thu Jul 25 20:24:41 2013 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Thu Jul 25 20:24:41 2013 +0300
----------------------------------------------------------------------
.../org/apache/cassandra/cql3/Constants.java | 19 ++++++++++++++++
src/java/org/apache/cassandra/cql3/Maps.java | 3 ++-
src/java/org/apache/cassandra/cql3/Sets.java | 4 ++--
.../cassandra/cql3/functions/FunctionCall.java | 23 ++++++++++++++++++++
4 files changed, 46 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c00c24cb/src/java/org/apache/cassandra/cql3/Constants.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/cql3/Constants.java
index bcfe00d,db264c4..1ae8787
--- a/src/java/org/apache/cassandra/cql3/Constants.java
+++ b/src/java/org/apache/cassandra/cql3/Constants.java
@@@ -20,7 -20,7 +20,8 @@@ package org.apache.cassandra.cql3
import java.nio.ByteBuffer;
import java.util.List;
+ import com.google.common.base.Objects;
+import org.apache.cassandra.serializers.MarshalException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c00c24cb/src/java/org/apache/cassandra/cql3/Maps.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c00c24cb/src/java/org/apache/cassandra/cql3/Sets.java
----------------------------------------------------------------------
