diff --git a/NEWS.txt b/NEWS.txt index ba369f6780..1d168f0dc9 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -34,6 +34,13 @@ Upgrading - Very large batches will now be rejected (defaults to 50kb). This can be customized by modifying batch_size_fail_threshold_in_kb. +2.1.2 +===== + +Upgrading +--------- + - Nothing specific to this release, but please see 2.1 if you are upgrading + from a previous version. 2.1.1 ===== diff --git a/debian/changelog b/debian/changelog index 853dd6a353..83c85dd6f5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ +cassandra (2.1.2) UNRELEASED; urgency=medium + + * New release + + -- Jake Luciani Wed, 05 Nov 2014 15:51:26 -0500 + cassandra (2.1.1) unstable; urgency=medium -======= * New release diff --git a/src/java/org/apache/cassandra/utils/concurrent/Locks.java b/src/java/org/apache/cassandra/utils/concurrent/Locks.java index 1ed549212a..dcbfe63d33 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/Locks.java +++ b/src/java/org/apache/cassandra/utils/concurrent/Locks.java @@ -1,3 +1,20 @@ +/* + * 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.utils.concurrent; import sun.misc.Unsafe; diff --git a/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java b/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java index 494b3b1ab9..ff8188fa4d 100644 --- a/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java +++ b/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java @@ -1,3 +1,20 @@ +/* + * 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.utils; import org.apache.cassandra.config.Config; diff --git a/tools/stress/src/org/apache/cassandra/stress/util/DynamicList.java b/tools/stress/src/org/apache/cassandra/stress/util/DynamicList.java index 2a38e7dfca..e5aaf44c56 100644 --- a/tools/stress/src/org/apache/cassandra/stress/util/DynamicList.java +++ b/tools/stress/src/org/apache/cassandra/stress/util/DynamicList.java @@ -1,3 +1,20 @@ +/* + * 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.stress.util; import java.util.Arrays;