Repository: cassandra Updated Branches: refs/heads/cassandra-1.2 93f54fc44 -> e39e9e593 refs/heads/cassandra-2.0 90058a97a -> 94ff63942 refs/heads/cassandra-2.1 e2bef02e2 -> 5b8ac8cbc refs/heads/trunk 33c5e19a2 -> 5001e982a
Update versions for 2.1.0-rc2 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e2bef02e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e2bef02e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e2bef02e Branch: refs/heads/trunk Commit: e2bef02e254a9c6e37a86cab957a1fcba56214fd Parents: 25baf71 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Mon Jun 23 18:59:48 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Mon Jun 23 19:00:07 2014 +0200 ---------------------------------------------------------------------- build.xml | 2 +- debian/changelog | 6 ++++++ .../cassandra/cql3/ContainsRelationTest.java | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2bef02e/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 26c360c..1f975f0 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,7 @@ <property name="debuglevel" value="source,lines,vars"/> <!-- default version and SCM information --> - <property name="base.version" value="2.1.0-rc1"/> + <property name="base.version" value="2.1.0-rc2"/> <property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/> <property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/> <property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2bef02e/debian/changelog ---------------------------------------------------------------------- diff --git a/debian/changelog b/debian/changelog index 772c950..845115b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (2.1.0~rc2) unstable; urgency=medium + + * New RC release + + -- Sylvain Lebresne <slebre...@apache.org> Mon, 23 Jun 2014 18:14:29 +0200 + cassandra (2.1.0~rc1) unstable; urgency=medium * New RC release http://git-wip-us.apache.org/repos/asf/cassandra/blob/e2bef02e/test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java b/test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java index 7b9ef91..eae9b9f 100644 --- a/test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java +++ b/test/unit/org/apache/cassandra/cql3/ContainsRelationTest.java @@ -1,3 +1,20 @@ +/* + * 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;