Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 9f208b085 -> ed630e30e
Ninja: fix bad merge of CASSANDRA-7804 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed630e30 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed630e30 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed630e30 Branch: refs/heads/cassandra-2.1 Commit: ed630e30eee913b5b29d882c439c8d1741d223ff Parents: 9f208b0 Author: Tyler Hobbs <ty...@datastax.com> Authored: Thu Aug 28 10:58:17 2014 -0500 Committer: Tyler Hobbs <ty...@datastax.com> Committed: Thu Aug 28 10:58:17 2014 -0500 ---------------------------------------------------------------------- .../org/apache/cassandra/cql3/statements/ModificationStatement.java | 1 - 1 file changed, 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed630e30/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java index d1d0c27..69d5472 100644 --- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java @@ -748,7 +748,6 @@ public abstract class ModificationStatement implements CQLStatement, MeasurableF { case PARTITION_KEY: case CLUSTERING_COLUMN: - throw new InvalidRequestException(String.format("PRIMARY KEY part %s found in SET part", entry.left)); throw new InvalidRequestException(String.format("PRIMARY KEY column '%s' cannot have IF conditions", entry.left)); default: stmt.addCondition(condition);
