Updated Branches: refs/heads/cassandra-1.2 d6d35ba31 -> 6165840f1
Versions and license for 1.2.11 release Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6165840f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6165840f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6165840f Branch: refs/heads/cassandra-1.2 Commit: 6165840f1584f932064b8ad2320b29de632ed813 Parents: d6d35ba Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Tue Oct 15 09:21:10 2013 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Tue Oct 15 09:21:10 2013 +0200 ---------------------------------------------------------------------- build.xml | 2 +- debian/changelog | 6 ++++++ .../apache/cassandra/metrics/ClientMetrics.java | 18 ++++++++++++++++++ .../org/apache/cassandra/pig/CqlTableTest.java | 18 ++++++++++++++++++ .../org/apache/cassandra/pig/PigTestBase.java | 18 ++++++++++++++++++ .../cassandra/pig/ThriftColumnFamilyTest.java | 18 ++++++++++++++++++ 6 files changed, 79 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6165840f/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 37109c8..3742910 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.10"/> + <property name="base.version" value="1.2.11"/> <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/6165840f/debian/changelog ---------------------------------------------------------------------- diff --git a/debian/changelog b/debian/changelog index 63f75b8..6643ed9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (1.2.11) unstable; urgency=low + + * New release + + -- Sylvain Lebresne <slebre...@apache.org> Tue, 15 Oct 2013 09:18:25 +0200 + cassandra (1.2.10) unstable; urgency=low * New release http://git-wip-us.apache.org/repos/asf/cassandra/blob/6165840f/src/java/org/apache/cassandra/metrics/ClientMetrics.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/ClientMetrics.java b/src/java/org/apache/cassandra/metrics/ClientMetrics.java index cb10ad5..59bc94d 100644 --- a/src/java/org/apache/cassandra/metrics/ClientMetrics.java +++ b/src/java/org/apache/cassandra/metrics/ClientMetrics.java @@ -1,3 +1,21 @@ +/* + * 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.metrics; import java.util.concurrent.Callable; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6165840f/test/unit/org/apache/cassandra/pig/CqlTableTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/pig/CqlTableTest.java b/test/unit/org/apache/cassandra/pig/CqlTableTest.java index e9266c9..785d819 100644 --- a/test/unit/org/apache/cassandra/pig/CqlTableTest.java +++ b/test/unit/org/apache/cassandra/pig/CqlTableTest.java @@ -1,3 +1,21 @@ +/* + * 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.pig; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6165840f/test/unit/org/apache/cassandra/pig/PigTestBase.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/pig/PigTestBase.java b/test/unit/org/apache/cassandra/pig/PigTestBase.java index b5f146a..ea06b8c 100644 --- a/test/unit/org/apache/cassandra/pig/PigTestBase.java +++ b/test/unit/org/apache/cassandra/pig/PigTestBase.java @@ -1,3 +1,21 @@ +/* + * 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.pig; import java.io.ByteArrayOutputStream; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6165840f/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyTest.java b/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyTest.java index 9dfa9f9..223cbf4 100644 --- a/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyTest.java +++ b/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyTest.java @@ -1,3 +1,21 @@ +/* + * 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.pig; import java.io.IOException;