Update versions and licenses for 1.2.14 release

This commit is contained in:
Sylvain Lebresne 2014-01-31 10:45:03 +01:00
parent 6ad995e8fa
commit 6a9314408c
4 changed files with 25 additions and 1 deletions

View File

@ -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

View File

@ -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"/>

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
cassandra (1.2.14) unstable; urgency=low
* New release
-- Sylvain Lebresne <slebresne@apache.org> Fri, 31 Jan 2014 10:29:13 +0100
cassandra (1.2.13) unstable; urgency=low
* New release

View File

@ -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;