Updates news file, version and missing licenses for 1.1.12 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0db94069 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0db94069 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0db94069 Branch: refs/heads/cassandra-1.2 Commit: 0db94069550b9c38b9f749e2087b196bb519664e Parents: 93cfbc1 Author: Sylvain Lebresne <[email protected]> Authored: Wed May 22 09:10:40 2013 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Wed May 22 09:10:40 2013 +0200 ---------------------------------------------------------------------- NEWS.txt | 9 ++++++ build.xml | 2 +- debian/changelog | 6 ++++ .../org/apache/cassandra/MethodComparator.java | 21 +++++++++++++ .../apache/cassandra/OrderedJUnit4ClassRunner.java | 23 ++++++++++++++- 5 files changed, 59 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0db94069/NEWS.txt ---------------------------------------------------------------------- diff --git a/NEWS.txt b/NEWS.txt index a768ddd..d5ba882 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -8,6 +8,15 @@ upgrade, just in case you need to roll back to the previous version. (Cassandra version X + 1 will always be able to read data files created by version X, but the inverse is not necessarily the case.) +1.1.12 +====== + +Upgrading +--------- + - Nothing specific to this release, but please see the previous instructions + if you are not upgrading from 1.1.11. + + 1.1.11 ====== http://git-wip-us.apache.org/repos/asf/cassandra/blob/0db94069/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index b77c417..945fff7 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.1.11"/> + <property name="base.version" value="1.1.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/0db94069/debian/changelog ---------------------------------------------------------------------- diff --git a/debian/changelog b/debian/changelog index 76bac83..9e33d7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (1.1.12) unstable; urgency=low + + * New release + + -- Sylvain Lebresne <[email protected]> Wed, 22 May 2013 08:54:45 +0200 + cassandra (1.1.11) unstable; urgency=low * New release http://git-wip-us.apache.org/repos/asf/cassandra/blob/0db94069/test/unit/org/apache/cassandra/MethodComparator.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/MethodComparator.java b/test/unit/org/apache/cassandra/MethodComparator.java index 690ae57..8cc163a 100644 --- a/test/unit/org/apache/cassandra/MethodComparator.java +++ b/test/unit/org/apache/cassandra/MethodComparator.java @@ -1,4 +1,25 @@ package org.apache.cassandra; +/* + * + * 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 org.junit.Ignore; import org.junit.runners.model.FrameworkMethod; http://git-wip-us.apache.org/repos/asf/cassandra/blob/0db94069/test/unit/org/apache/cassandra/OrderedJUnit4ClassRunner.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/OrderedJUnit4ClassRunner.java b/test/unit/org/apache/cassandra/OrderedJUnit4ClassRunner.java index d84aedb..d0dec24 100644 --- a/test/unit/org/apache/cassandra/OrderedJUnit4ClassRunner.java +++ b/test/unit/org/apache/cassandra/OrderedJUnit4ClassRunner.java @@ -1,4 +1,25 @@ package org.apache.cassandra; +/* + * + * 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 org.junit.runners.BlockJUnit4ClassRunner; import org.junit.runners.model.FrameworkMethod; @@ -31,4 +52,4 @@ public class OrderedJUnit4ClassRunner extends BlockJUnit4ClassRunner return list; } } -} \ No newline at end of file +}
