cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject [1/3] git commit: Prep for 2.1.2
Date Wed, 05 Nov 2014 21:04:39 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk 4fd3349e2 -> 19c2d22e9


Prep for 2.1.2


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

Branch: refs/heads/trunk
Commit: 44e9f23d4f2e85bbf82b2a0724a794a4bf25a462
Parents: 4f863be
Author: Jake Luciani <jake@apache.org>
Authored: Wed Nov 5 15:56:15 2014 -0500
Committer: Jake Luciani <jake@apache.org>
Committed: Wed Nov 5 15:56:15 2014 -0500

----------------------------------------------------------------------
 NEWS.txt                                           |  2 +-
 build.xml                                          |  2 +-
 debian/changelog                                   |  7 ++++++-
 .../apache/cassandra/utils/concurrent/Locks.java   | 17 +++++++++++++++++
 .../cassandra/utils/JVMStabilityInspectorTest.java | 17 +++++++++++++++++
 .../apache/cassandra/stress/util/DynamicList.java  | 17 +++++++++++++++++
 6 files changed, 59 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/44e9f23d/NEWS.txt
----------------------------------------------------------------------
diff --git a/NEWS.txt b/NEWS.txt
index d3d7b76..de535ef 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -13,7 +13,7 @@ restore snapshots created with the previous major version using the
 'sstableloader' tool. You can upgrade the file format of your snapshots
 using the provided 'sstableupgrade' tool.
 
-2.1.1
+2.1.2
 =====
 
 Upgrading

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44e9f23d/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index e2785c1..b20ca90 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="2.1.1"/>
+    <property name="base.version" value="2.1.2"/>
     <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/44e9f23d/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index 853dd6a..83c85dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
+cassandra (2.1.2) UNRELEASED; urgency=medium
+
+  * New release 
+
+ -- Jake Luciani <jake@ubuntuosx>  Wed, 05 Nov 2014 15:51:26 -0500
+
 cassandra (2.1.1) unstable; urgency=medium
-=======
 
   * New release
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44e9f23d/src/java/org/apache/cassandra/utils/concurrent/Locks.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/concurrent/Locks.java b/src/java/org/apache/cassandra/utils/concurrent/Locks.java
index 1ed5492..dcbfe63 100644
--- a/src/java/org/apache/cassandra/utils/concurrent/Locks.java
+++ b/src/java/org/apache/cassandra/utils/concurrent/Locks.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.utils.concurrent;
 
 import sun.misc.Unsafe;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44e9f23d/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java b/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java
index 494b3b1..ff8188f 100644
--- a/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java
+++ b/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.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.utils;
 
 import org.apache.cassandra.config.Config;

http://git-wip-us.apache.org/repos/asf/cassandra/blob/44e9f23d/tools/stress/src/org/apache/cassandra/stress/util/DynamicList.java
----------------------------------------------------------------------
diff --git a/tools/stress/src/org/apache/cassandra/stress/util/DynamicList.java b/tools/stress/src/org/apache/cassandra/stress/util/DynamicList.java
index 2a38e7d..e5aaf44 100644
--- a/tools/stress/src/org/apache/cassandra/stress/util/DynamicList.java
+++ b/tools/stress/src/org/apache/cassandra/stress/util/DynamicList.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.stress.util;
 
 import java.util.Arrays;


Mime
View raw message