Update version, news, license, ... for 1.1.5 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/acaa5246 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/acaa5246 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/acaa5246 Branch: refs/heads/trunk Commit: acaa52465554e82519fc312d3fcff586f55ee36e Parents: 2cd7363 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Thu Sep 6 08:57:57 2012 +0200 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Thu Sep 6 08:57:57 2012 +0200 ---------------------------------------------------------------------- CHANGES.txt | 5 ++++ NEWS.txt | 18 +++++++++++++++ build.xml | 2 +- debian/changelog | 6 +++++ .../db/columniterator/ISSTableColumnIterator.java | 18 +++++++++++++++ 5 files changed, 48 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/acaa5246/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 04fa0bf..b33b2c3 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -9,6 +9,11 @@ * Change nodetool setcachecapcity to manipulate global caches (CASSANDRA-4563) * (cql3) fix setting compaction strategy (CASSANDRA-4597) * fix broken system.schema_* timestamps on system startup (CASSANDRA-4561) + * fix wrong skip of cache saving (CASSANDRA-4533) + * Avoid NPE when lost+found is in data dir (CASSANDRA-4572) + * Respect five-minute flush moratorium after initial CL replay (CASSANDRA-4474) + * Adds ntp as recommended in debian packaging (CASSANDRA-4606) + * Configurable transport in CF Record{Reader|Writer} (CASSANDRA-4558) Merged from 1.0: * increase Xss to 160k to accomodate latest 1.6 JVMs (CASSANDRA-4602) * fix toString of hint destination tokens (CASSANDRA-4568) http://git-wip-us.apache.org/repos/asf/cassandra/blob/acaa5246/NEWS.txt ---------------------------------------------------------------------- diff --git a/NEWS.txt b/NEWS.txt index a127ead..ad22610 100644 --- a/NEWS.txt +++ b/NEWS.txt @@ -9,6 +9,24 @@ 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.5 +===== + +Upgrading +--------- + - Nothing specific to this release, but please see 1.1 if you are upgrading + from a previous version. + + +1.1.4 +===== + +Upgrading +--------- + - Nothing specific to this release, but please see 1.1 if you are upgrading + from a previous version. + + 1.1.3 ===== http://git-wip-us.apache.org/repos/asf/cassandra/blob/acaa5246/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 10dbecc..b498d12 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.1.4"/> + <property name="base.version" value="1.1.5"/> <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/acaa5246/debian/changelog ---------------------------------------------------------------------- diff --git a/debian/changelog b/debian/changelog index 9c6bfdc..8e6b389 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +cassandra (1.1.5) unstable; urgency=low + + * New release + + -- Sylvain Lebresne <slebre...@apache.org> Thu, 06 Sep 2012 08:53:50 +0200 + cassandra (1.1.4) unstable; urgency=low * New release http://git-wip-us.apache.org/repos/asf/cassandra/blob/acaa5246/src/java/org/apache/cassandra/db/columniterator/ISSTableColumnIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/columniterator/ISSTableColumnIterator.java b/src/java/org/apache/cassandra/db/columniterator/ISSTableColumnIterator.java index 4da4c0a..0b6a652 100644 --- a/src/java/org/apache/cassandra/db/columniterator/ISSTableColumnIterator.java +++ b/src/java/org/apache/cassandra/db/columniterator/ISSTableColumnIterator.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.columniterator; import org.apache.cassandra.io.sstable.SSTableReader;
