From c9f88103d0a75d838e12ba7037b3893abba65421 Mon Sep 17 00:00:00 2001
From: Jonathan Ellis <jbellis@apache.org>
Date: Tue, 3 Apr 2012 11:12:13 -0500
Subject: [PATCH 1/2] guess correct version of Python for Arch Linux patch by
 Andrew Ash and Paul Cannon for CASSANDRA-4090

---
 CHANGES.txt | 4 ++++
 bin/cqlsh   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 457b8cc5ae..579b3a5ce4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+1.0.10
+ * cqlsh: guess correct version of Python for Arch Linux (CASSANDRA-4090)
+
+
 1.0.9
  * improve index sampling performance (CASSANDRA-4023)
  * always compact away deleted hints immediately after handoff (CASSANDRA-3955)
diff --git a/bin/cqlsh b/bin/cqlsh
index 7431bee36e..7a9d0a3ffb 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -20,7 +20,7 @@
 """:"
 # bash code here; finds a suitable python interpreter and execs this file.
 # prefer unqualified "python" if suitable:
-python -c 'import sys; sys.exit(sys.hexversion < 0x020500b0)' 2>/dev/null \
+python -c 'import sys; sys.exit(not (0x020500b0 < sys.hexversion < 0x03000000))' 2>/dev/null \
     && exec python "$0" "$@"
 for pyver in 2.6 2.7 2.5; do
     which python$pyver > /dev/null 2>&1 && exec python$pyver "$0" "$@"

From 1a42cf3f8e3ef33b22c3f7cf32c981eb2eb3de93 Mon Sep 17 00:00:00 2001
From: Brandon Williams <brandonwilliams@apache.org>
Date: Thu, 5 Apr 2012 14:53:54 -0500
Subject: [PATCH 2/2] Backport CASSANDRA-3600 to 0.8

---
 .../apache/cassandra/service/StorageService.java    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 808d6dee8a..132628b24e 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -79,7 +79,7 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
 {
     private static Logger logger_ = LoggerFactory.getLogger(StorageService.class);     
 
-    public static final int RING_DELAY = 30 * 1000; // delay after which we assume ring has stablized
+    public static final int RING_DELAY = getRingDelay(); // delay after which we assume ring has stablized
 
     /* All verb handler identifiers */
     public enum Verb
@@ -146,6 +146,17 @@ public class StorageService implements IEndpointStateChangeSubscriber, StorageSe
         put(Verb.UNUSED_3, Stage.INTERNAL_RESPONSE);
     }};
 
+    private static int getRingDelay()
+    {
+        String newdelay = System.getProperty("cassandra.ring_delay_ms");
+        if (newdelay != null)
+        {
+            logger_.warn("Overriding RING_DELAY to {}ms", newdelay);
+            return Integer.parseInt(newdelay);
+        }
+        else
+            return 30 * 1000;
+    }
 
     /**
      * This pool is used for periodic short (sub-second) tasks.