From 2f4b6d8c61d81ac4c878a4399a3634221deeb075 Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Tue, 27 Nov 2012 09:34:48 +0100 Subject: [PATCH] Update version, changes, news and licenses for 1.1.7 release --- CHANGES.txt | 6 ++++++ NEWS.txt | 9 +++++++++ build.xml | 2 +- debian/changelog | 6 ++++++ .../columniterator/IColumnIteratorFactory.java | 17 +++++++++++++++++ .../db/columniterator/LazyColumnIterator.java | 17 +++++++++++++++++ 6 files changed, 56 insertions(+), 1 deletion(-) diff --git a/CHANGES.txt b/CHANGES.txt index 7c653d02e8..6401cd0a12 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -22,6 +22,12 @@ * Allow static CF definition with compact storage (CASSANDRA-4910) * Fix endless loop/compaction of schema_* CFs due to broken timestamps (CASSANDRA-4880) * Fix 'wrong class type' assertion in CounterColumn (CASSANDRA-4976) + * Fix cqlsh timestamp formatting of timezone info (CASSANDRA-4746) + * Fix assertion failure with leveled compaction (CASSANDRA-4799) + * Check for null end_token in get_range_slice (CASSANDRA-4804) + * Remove all remnants of removed nodes (CASSANDRA-4840) + * Add aut-reloading of the log4j file in debian package (CASSANDRA-4855) + * Fix estimated row cache entry size (CASSANDRA-4860) 1.1.6 diff --git a/NEWS.txt b/NEWS.txt index 667a055dbd..0431a3e726 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -9,6 +9,15 @@ upgrade, just in case you need to roll back to the previous version. by version X, but the inverse is not necessarily the case.) +1.1.7 +===== + +Upgrading +--------- + - Nothing specific to this release, but please see the previous instruction + if you are not upgrading from 1.1.7. + + 1.1.6 ===== diff --git a/build.xml b/build.xml index 551e1bd6a0..8ac0cca0d5 100644 --- a/build.xml +++ b/build.xml @@ -25,7 +25,7 @@ - + diff --git a/debian/changelog b/debian/changelog index 8503c52709..b2b17b1c6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (1.1.7) unstable; urgency=low + + * New release + + -- Sylvain Lebresne Tue, 27 Nov 2012 09:32:16 +0100 + cassandra (1.1.6) unstable; urgency=low * New release diff --git a/src/java/org/apache/cassandra/db/columniterator/IColumnIteratorFactory.java b/src/java/org/apache/cassandra/db/columniterator/IColumnIteratorFactory.java index c9ce857fd3..8e466e6f4f 100644 --- a/src/java/org/apache/cassandra/db/columniterator/IColumnIteratorFactory.java +++ b/src/java/org/apache/cassandra/db/columniterator/IColumnIteratorFactory.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.db.columniterator; public interface IColumnIteratorFactory diff --git a/src/java/org/apache/cassandra/db/columniterator/LazyColumnIterator.java b/src/java/org/apache/cassandra/db/columniterator/LazyColumnIterator.java index 486836d005..19e5091a43 100644 --- a/src/java/org/apache/cassandra/db/columniterator/LazyColumnIterator.java +++ b/src/java/org/apache/cassandra/db/columniterator/LazyColumnIterator.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.db.columniterator; import com.google.common.collect.AbstractIterator;