Updated Branches: refs/heads/cassandra-1.2 50970320d -> 026865f2a
Update versions, licenses for 1.2.12 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/026865f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/026865f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/026865f2 Branch: refs/heads/cassandra-1.2 Commit: 026865f2a36d9685057c407e3fa528c101ab46b7 Parents: 5097032 Author: Sylvain Lebresne <[email protected]> Authored: Wed Nov 20 09:43:28 2013 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Nov 20 09:43:28 2013 +0100 ---------------------------------------------------------------------- build.xml | 2 +- debian/changelog | 6 ++++++ .../cassandra/pig/CqlTableDataTypeTest.java | 21 ++++++++++++++++++++ .../pig/ThriftColumnFamilyDataTypeTest.java | 21 ++++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/026865f2/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 50323ca..8efb7a3 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.11"/> + <property name="base.version" value="1.2.12"/> <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/026865f2/debian/changelog ---------------------------------------------------------------------- diff --git a/debian/changelog b/debian/changelog index 6643ed9..93894b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (1.2.12) unstable; urgency=low + + * New release + + -- Sylvain Lebresne <[email protected]> Wed, 20 Nov 2013 09:41:23 +0100 + cassandra (1.2.11) unstable; urgency=low * New release http://git-wip-us.apache.org/repos/asf/cassandra/blob/026865f2/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java b/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java index a0f1f47..c81ff07 100644 --- a/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java +++ b/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java @@ -1,4 +1,25 @@ package org.apache.cassandra.pig; +/* + * + * 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. + * + */ + import java.io.IOException; import java.nio.charset.CharacterCodingException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/026865f2/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java b/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java index 2f97549..2cf1c89 100644 --- a/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java +++ b/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java @@ -1,4 +1,25 @@ package org.apache.cassandra.pig; +/* + * + * 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. + * + */ + import java.io.IOException; import java.nio.charset.CharacterCodingException;
