Updated Branches: refs/heads/cassandra-1.2 6ad995e8f -> 6a9314408
Update versions and licenses for 1.2.14 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6a931440 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6a931440 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6a931440 Branch: refs/heads/cassandra-1.2 Commit: 6a9314408cbd69ce26c2ba04bf49df7809a911bf Parents: 6ad995e Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Fri Jan 31 10:45:03 2014 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Fri Jan 31 10:45:03 2014 +0100 ---------------------------------------------------------------------- .rat-excludes | 1 + build.xml | 2 +- debian/changelog | 6 ++++++ .../apache/cassandra/db/BatchlogManagerTest.java | 17 +++++++++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a931440/.rat-excludes ---------------------------------------------------------------------- diff --git a/.rat-excludes b/.rat-excludes index f7f9637..112aec0 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -32,3 +32,4 @@ test/data/legacy-sstables/** examples/pig/** examples/hadoop_word_count/conf/log4j.properties pylib/cqlshlib/test/** +src/resources/org/apache/cassandra/config/version.properties http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a931440/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 23f8c71..2a6c524 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="1.2.13"/> + <property name="base.version" value="1.2.14"/> <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/6a931440/debian/changelog ---------------------------------------------------------------------- diff --git a/debian/changelog b/debian/changelog index b419cb7..472063e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (1.2.14) unstable; urgency=low + + * New release + + -- Sylvain Lebresne <slebre...@apache.org> Fri, 31 Jan 2014 10:29:13 +0100 + cassandra (1.2.13) unstable; urgency=low * New release http://git-wip-us.apache.org/repos/asf/cassandra/blob/6a931440/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java b/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java index 637815b..08728fc 100644 --- a/test/unit/org/apache/cassandra/db/BatchlogManagerTest.java +++ b/test/unit/org/apache/cassandra/db/BatchlogManagerTest.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.db; import java.net.InetAddress;