cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [4/7] git commit: Versions and license for 1.2.6 release
Date Fri, 21 Jun 2013 18:33:40 GMT
Versions and license for 1.2.6 release


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/79410e4a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/79410e4a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/79410e4a

Branch: refs/heads/trunk
Commit: 79410e4a887e7adac796339c1a565436deaf254a
Parents: b7e13b8
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Fri Jun 21 19:12:31 2013 +0200
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Fri Jun 21 19:12:31 2013 +0200

----------------------------------------------------------------------
 NEWS.txt                                           |  1 -
 build.xml                                          |  2 +-
 debian/changelog                                   |  6 ++++++
 .../locator/ReconnectableSnitchHelper.java         | 17 +++++++++++++++++
 4 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/79410e4a/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index dbc9aab..cb40981 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -21,7 +21,6 @@ Upgrading
     - hinted_handoff_throttle_in_kb is now reduced by a factor
       proportional to the number of nodes in the cluster (see
       https://issues.apache.org/jira/browse/CASSANDRA-5272).
-
     - CQL3 syntax for CREATE CUSTOM INDEX has been updated. See CQL3
       documentation for details.
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/79410e4a/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 46ffbb1..4e32351 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.5"/>
+    <property name="base.version" value="1.2.6"/>
     <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/79410e4a/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 626374f..3be9ba0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (1.2.6) unstable; urgency=low
+
+  * New release
+
+ -- Sylvain Lebresne <slebresne@apache.org>  Fri, 21 Jun 2013 18:58:24 +0200
+
 cassandra (1.2.5) unstable; urgency=low
 
   * New release

http://git-wip-us.apache.org/repos/asf/cassandra/blob/79410e4a/src/java/org/apache/cassandra/locator/ReconnectableSnitchHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/ReconnectableSnitchHelper.java b/src/java/org/apache/cassandra/locator/ReconnectableSnitchHelper.java
index adec953..bef245e 100644
--- a/src/java/org/apache/cassandra/locator/ReconnectableSnitchHelper.java
+++ b/src/java/org/apache/cassandra/locator/ReconnectableSnitchHelper.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.locator;
 
 import java.net.InetAddress;


Mime
View raw message