You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2013/01/25 21:27:58 UTC
[2/9] git commit: Update version for 1.2.1 release
Update version for 1.2.1 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88bdda74
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88bdda74
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88bdda74
Branch: refs/heads/trunk
Commit: 88bdda742c8c213f76b1fd8a6296dd7240261b05
Parents: d49bae6
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Thu Jan 24 18:43:10 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Thu Jan 24 18:43:10 2013 +0100
----------------------------------------------------------------------
build.xml | 2 +-
debian/changelog | 6 +++++
.../cassandra/io/util/PoolingSegmentedFile.java | 17 +++++++++++++++
3 files changed, 24 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/88bdda74/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 255b407..772e8aa 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.2.0"/>
+ <property name="base.version" value="1.2.1"/>
<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/88bdda74/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index d993e82..0310c90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.2.1) unstable; urgency=low
+
+ * New release
+
+ -- Sylvain Lebresne <sl...@apache.org> Thu, 24 Jan 2013 18:41:21 +0100
+
cassandra (1.2.0) unstable; urgency=low
* New release
http://git-wip-us.apache.org/repos/asf/cassandra/blob/88bdda74/src/java/org/apache/cassandra/io/util/PoolingSegmentedFile.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/PoolingSegmentedFile.java b/src/java/org/apache/cassandra/io/util/PoolingSegmentedFile.java
index 2e0acfc..4173d5a 100644
--- a/src/java/org/apache/cassandra/io/util/PoolingSegmentedFile.java
+++ b/src/java/org/apache/cassandra/io/util/PoolingSegmentedFile.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.io.util;
import java.util.Queue;