You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2012/07/31 07:10:07 UTC
[5/8] git commit: Update news, version and licenses for 1.1.3 release
Update news, version and licenses for 1.1.3 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d0392208
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d0392208
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d0392208
Branch: refs/heads/trunk
Commit: d0392208f5156fc8febeb6d5d8a4fbf3aad6992b
Parents: 1209c9e
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Mon Jul 30 18:35:07 2012 +0200
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Jul 30 18:35:07 2012 +0200
----------------------------------------------------------------------
NEWS.txt | 13 +++++++++++++
build.xml | 2 +-
debian/cassandra.install | 1 +
debian/changelog | 6 ++++++
tools/bin/token-generator | 16 ++++++++++++++++
5 files changed, 37 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0392208/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index fd7be27..b1d8969 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -9,6 +9,19 @@ 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.3
+=====
+
+Upgrading
+---------
+ - Nothing specific to this release, but please see 1.1 if you are upgrading
+ from a previous version.
+
+Features
+--------
+ - the cqlsh COPY command can now export to CSV flat files
+ - added a new tools/bin/token-generator to facilitate generating evenly distributed tokens
+
1.1.2
=====
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0392208/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 60903a6..e23483c 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.2"/>
+ <property name="base.version" value="1.1.3"/>
<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/d0392208/debian/cassandra.install
----------------------------------------------------------------------
diff --git a/debian/cassandra.install b/debian/cassandra.install
index f706bd9..04e8d4f 100644
--- a/debian/cassandra.install
+++ b/debian/cassandra.install
@@ -13,6 +13,7 @@ bin/sstablekeys usr/bin
bin/sstableloader usr/bin
bin/cqlsh usr/bin
tools/bin/cassandra-stress usr/bin
+tools/bin/token-generator usr/bin
lib/*.jar usr/share/cassandra/lib
lib/*.zip usr/share/cassandra/lib
lib/licenses usr/share/doc/cassandra
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0392208/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 4b97f75..946498c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.1.3) unstable; urgency=low
+
+ * New release
+
+ -- Sylvain Lebresne <sl...@apache.org> Mon, 30 Jul 2012 18:33:25 +0200
+
cassandra (1.1.2) unstable; urgency=low
* New release
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d0392208/tools/bin/token-generator
----------------------------------------------------------------------
diff --git a/tools/bin/token-generator b/tools/bin/token-generator
old mode 100644
new mode 100755
index 57d7fce..c958529
--- a/tools/bin/token-generator
+++ b/tools/bin/token-generator
@@ -1,5 +1,21 @@
#!/usr/bin/env python
+# 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.
+
from __future__ import with_statement
import os