Updated Branches: refs/heads/cassandra-1.2 8eca4ad01 -> f07804e0d
Update versions and license for 1.2.3 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f07804e0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f07804e0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f07804e0 Branch: refs/heads/cassandra-1.2 Commit: f07804e0d0cf57bc6e1e2924a7b926d55408f640 Parents: 8eca4ad Author: Sylvain Lebresne <[email protected]> Authored: Thu Mar 14 10:19:05 2013 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Thu Mar 14 10:19:05 2013 +0100 ---------------------------------------------------------------------- build.xml | 2 +- debian/changelog | 6 ++++ .../org/apache/cassandra/MethodComparator.java | 21 +++++++++++++ .../apache/cassandra/OrderedJUnit4ClassRunner.java | 23 ++++++++++++++- 4 files changed, 50 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f07804e0/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 1ab9c94..049ee8f 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.2"/> + <property name="base.version" value="1.2.3"/> <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/f07804e0/debian/changelog ---------------------------------------------------------------------- diff --git a/debian/changelog b/debian/changelog index 0a71ffb..e0bc2a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (1.2.3) unstable; urgency=low + + * New release + + -- Sylvain Lebresne <[email protected]> Thu, 14 Mar 2013 09:52:16 +0100 + cassandra (1.2.2) unstable; urgency=low * New release http://git-wip-us.apache.org/repos/asf/cassandra/blob/f07804e0/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/f07804e0/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 +}
