From cd37d07baf5394d9bac6763de4556249e9837bb0 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Fri, 8 Aug 2014 10:54:41 +0200 Subject: [PATCH] Version and licenses for 2.0.10 release --- .rat-excludes | 1 + NEWS.txt | 5 ++--- build.xml | 2 +- debian/changelog | 6 ++++++ .../cassandra/hadoop/pig/CqlNativeStorage.java | 17 +++++++++++++++++ ...QueryFilterWithStaticColumnsPresentTest.java | 17 +++++++++++++++++ 6 files changed, 44 insertions(+), 4 deletions(-) diff --git a/.rat-excludes b/.rat-excludes index 0da5ab9f97..503b3a6b92 100644 --- a/.rat-excludes +++ b/.rat-excludes @@ -30,3 +30,4 @@ examples/triggers/conf/* examples/hadoop_word_count/conf/log4j.properties pylib/cqlshlib/test/** src/resources/org/apache/cassandra/config/version.properties +**/hotspot_compiler diff --git a/NEWS.txt b/NEWS.txt index 04913842b7..7fa8be9c45 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -14,13 +14,12 @@ restore snapshots created with the previous major version using the using the provided 'sstableupgrade' tool. 2.0.10 -==== +====== New features ------------ - CqlPaginRecordReader and CqlPagingInputFormat have both been removed. Use CqlInputFormat instead. - - If you are using Leveled Compaction, you can now disable doing - size-tiered + - If you are using Leveled Compaction, you can now disable doing size-tiered compaction in L0 by starting Cassandra with -Dcassandra.disable_stcs_in_l0 (see CASSANDRA-6621 for details). - Shuffle and taketoken have been removed. For clusters that choose to diff --git a/build.xml b/build.xml index 4b64570e89..611345d80b 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,7 @@ - + diff --git a/debian/changelog b/debian/changelog index 73fea4c974..e0b1eae726 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (2.0.10) unstable; urgency=medium + + * New release + + -- Sylvain Lebresne Fri, 08 Aug 2014 10:50:44 +0200 + cassandra (2.0.9) unstable; urgency=medium * New release diff --git a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java index 948d21c596..1e48bf4ead 100644 --- a/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.java +++ b/src/java/org/apache/cassandra/hadoop/pig/CqlNativeStorage.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.hadoop.pig; import java.io.IOException; diff --git a/test/unit/org/apache/cassandra/cql3/SliceQueryFilterWithStaticColumnsPresentTest.java b/test/unit/org/apache/cassandra/cql3/SliceQueryFilterWithStaticColumnsPresentTest.java index a21ebdc2fa..75d1a1d5b6 100644 --- a/test/unit/org/apache/cassandra/cql3/SliceQueryFilterWithStaticColumnsPresentTest.java +++ b/test/unit/org/apache/cassandra/cql3/SliceQueryFilterWithStaticColumnsPresentTest.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.cql3; import org.apache.cassandra.SchemaLoader;