Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e28cc635 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e28cc635 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e28cc635 Branch: refs/heads/trunk Commit: e28cc6354e3ac45edf4c6fafea4599720e2dab97 Parents: d13a996 59a8504 Author: Sylvain Lebresne <[email protected]> Authored: Mon Jul 7 18:06:31 2014 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Mon Jul 7 18:06:31 2014 +0200 ---------------------------------------------------------------------- CHANGES.txt | 4 +- .../org/apache/cassandra/cql3/Constants.java | 8 +- .../org/apache/cassandra/cql3/UserTypes.java | 11 ++ .../cassandra/cql3/VariableSpecifications.java | 6 ++ .../cql3/statements/SelectStatement.java | 1 + .../org/apache/cassandra/transport/Message.java | 51 +++++---- .../org/apache/cassandra/cql3/CQLTester.java | 82 ++++++++++++-- .../cassandra/cql3/ContainsRelationTest.java | 106 +++++++++++-------- .../apache/cassandra/cql3/UserTypesTest.java | 33 ++++++ 9 files changed, 227 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e28cc635/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e28cc635/src/java/org/apache/cassandra/cql3/Constants.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e28cc635/test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java index 7b9ef91,0c6cfe1..508cc4a --- a/test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java +++ b/test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java @@@ -1,12 -1,24 +1,7 @@@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ package org.apache.cassandra.cql3; - import static com.google.common.collect.Lists.newArrayList; - import static com.google.common.collect.Sets.newHashSet; - import org.junit.Test; - import com.google.common.collect.ImmutableMap; - public class ContainsRelationTest extends CQLTester { @Test
