Repository: cassandra Updated Branches: refs/heads/trunk be6cf8a32 -> d6f3cdf6f
Update versions for 2.1.0-rc5 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cfb335e3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cfb335e3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cfb335e3 Branch: refs/heads/trunk Commit: cfb335e39b080c031faf76671c67cc003af22635 Parents: fb3995a Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Sat Aug 2 13:48:00 2014 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Sat Aug 2 13:48:00 2014 +0200 ---------------------------------------------------------------------- build.xml | 2 +- debian/changelog | 6 ++++++ .../cassandra/cql3/StaticColumnsQueryTest.java | 17 +++++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb335e3/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index ca973cc..52c5158 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-rc4"/> + <property name="base.version" value="2.1.0-rc5"/> <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/cfb335e3/debian/changelog ---------------------------------------------------------------------- diff --git a/debian/changelog b/debian/changelog index 7a38d2d..03e308e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (2.1.0~rc5) unstable; urgency=medium + + * New RC release + + -- Sylvain Lebresne <slebre...@apache.org> Sat, 02 Aug 2014 13:45:54 +0200 + cassandra (2.1.0~rc4) unstable; urgency=medium * New RC release http://git-wip-us.apache.org/repos/asf/cassandra/blob/cfb335e3/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java b/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java index b386026..e27f968 100644 --- a/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.java +++ b/test/unit/org/apache/cassandra/cql3/StaticColumnsQueryTest.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 org.junit.Test;