From b6147c1c7bfca817429f1e13d4dd9096bee5e626 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Tue, 22 Oct 2013 18:01:51 +0200 Subject: [PATCH] License and versions for 2.0.2 release --- .rat-excludes | 1 + build.xml | 2 +- debian/changelog | 6 ++++++ examples/triggers/build.xml | 19 ++++++++++++++++++ .../triggers/conf/InvertedIndex.properties | 19 +++++++++++++++++- .../TombstoneOverwhelmingException.java | 18 +++++++++++++++++ .../cassandra/metrics/RestorableMeter.java | 20 ++++++++++++++++++- .../cassandra/net/WriteCallbackInfo.java | 18 +++++++++++++++++ .../cassandra/pig/CqlTableDataTypeTest.java | 18 +++++++++++++++++ .../pig/ThriftColumnFamilyDataTypeTest.java | 18 +++++++++++++++++ 10 files changed, 136 insertions(+), 3 deletions(-) diff --git a/.rat-excludes b/.rat-excludes index 8d2ead8d94..78473b9458 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -15,6 +15,7 @@ lib/licenses/*.txt .settings/** **/cassandra.yaml **/cassandra-topology.yaml +**/metrics-reporter-config-sample.yaml **/*.db .externalToolBuilders/** test/data/serialization/*/* diff --git a/build.xml b/build.xml index 2703edf415..09a0213f6b 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,7 @@ - + diff --git a/debian/changelog b/debian/changelog index 61a91d7ccf..4d99120e4c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (2.0.2) unstable; urgency=low + + * New release + + -- Sylvain Lebresne Tue, 22 Oct 2013 17:44:30 +0200 + cassandra (2.0.1) unstable; urgency=low * New release diff --git a/examples/triggers/build.xml b/examples/triggers/build.xml index 55fcccefc9..293b08d794 100644 --- a/examples/triggers/build.xml +++ b/examples/triggers/build.xml @@ -1,4 +1,23 @@ + + diff --git a/examples/triggers/conf/InvertedIndex.properties b/examples/triggers/conf/InvertedIndex.properties index 6db6d61b6d..3ec2bb04bb 100644 --- a/examples/triggers/conf/InvertedIndex.properties +++ b/examples/triggers/conf/InvertedIndex.properties @@ -1,2 +1,19 @@ +# 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. + keyspace=Keyspace1 -columnfamily=InvertedIndex \ No newline at end of file +columnfamily=InvertedIndex diff --git a/src/java/org/apache/cassandra/db/filter/TombstoneOverwhelmingException.java b/src/java/org/apache/cassandra/db/filter/TombstoneOverwhelmingException.java index 597546380d..6a6b0f6b65 100644 --- a/src/java/org/apache/cassandra/db/filter/TombstoneOverwhelmingException.java +++ b/src/java/org/apache/cassandra/db/filter/TombstoneOverwhelmingException.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.db.filter; public class TombstoneOverwhelmingException extends RuntimeException diff --git a/src/java/org/apache/cassandra/metrics/RestorableMeter.java b/src/java/org/apache/cassandra/metrics/RestorableMeter.java index 7da2ff951f..4df46654ed 100644 --- a/src/java/org/apache/cassandra/metrics/RestorableMeter.java +++ b/src/java/org/apache/cassandra/metrics/RestorableMeter.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 com.yammer.metrics.core.Clock; @@ -182,4 +200,4 @@ public class RestorableMeter return rate * NANOS_PER_SECOND; } } -} \ No newline at end of file +} diff --git a/src/java/org/apache/cassandra/net/WriteCallbackInfo.java b/src/java/org/apache/cassandra/net/WriteCallbackInfo.java index abded75ad6..38e4b5ad0f 100644 --- a/src/java/org/apache/cassandra/net/WriteCallbackInfo.java +++ b/src/java/org/apache/cassandra/net/WriteCallbackInfo.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.net; import java.net.InetAddress; diff --git a/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java b/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java index a0f1f4756b..352b2e2edc 100644 --- a/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.java +++ b/test/unit/org/apache/cassandra/pig/CqlTableDataTypeTest.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; diff --git a/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java b/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java index 2f97549929..cc5462057f 100644 --- a/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.java +++ b/test/unit/org/apache/cassandra/pig/ThriftColumnFamilyDataTypeTest.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;