From 8b5b1854c3a496dd13372aac896fb914f199ed88 Mon Sep 17 00:00:00 2001
From: Michael Shuler <mshuler@apache.org>
Date: Tue, 16 Aug 2016 18:04:08 -0500
Subject: [PATCH 1/3] Update build.xml and debian/changelog for 3.0.9

---
 build.xml        | 2 +-
 debian/changelog | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 02e868710d..acc7c9ee95 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="3.0.8"/>
+    <property name="base.version" value="3.0.9"/>
     <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"/>
diff --git a/debian/changelog b/debian/changelog
index 69b7cf9130..d54d59a381 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (3.0.9) unstable; urgency=medium
+
+  * New release
+
+ -- Michael Shuler <mshuler@apache.org>  Tue, 16 Aug 2016 18:02:20 -0500
+
 cassandra (3.0.8) unstable; urgency=medium
 
   * New release 

From 5694a2ac3f227bdd22f1532059b566820deaf23e Mon Sep 17 00:00:00 2001
From: Marcus Eriksson <marcuse@apache.org>
Date: Wed, 10 Aug 2016 08:34:28 +0200
Subject: [PATCH 2/3] Debug logging for unit tests

Patch by marcuse; reviewed by Michael Shuler for CASSANDRA-12425
---
 test/conf/logback-test.xml                         |  2 +-
 test/unit/org/apache/cassandra/cql3/CQLTester.java | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/conf/logback-test.xml b/test/conf/logback-test.xml
index abedc32901..21c7142941 100644
--- a/test/conf/logback-test.xml
+++ b/test/conf/logback-test.xml
@@ -68,7 +68,7 @@
       <appender-ref ref="TEE"/>
   </appender>
 
-  <root level="INFO">
+  <root level="DEBUG">
     <appender-ref ref="ASYNC" />
   </root>
 </configuration>
diff --git a/test/unit/org/apache/cassandra/cql3/CQLTester.java b/test/unit/org/apache/cassandra/cql3/CQLTester.java
index c9c46314ee..7f5eb025e2 100644
--- a/test/unit/org/apache/cassandra/cql3/CQLTester.java
+++ b/test/unit/org/apache/cassandra/cql3/CQLTester.java
@@ -707,8 +707,8 @@ public abstract class CQLTester
         UntypedResultSet rs;
         if (usePrepared)
         {
-            if (logger.isDebugEnabled())
-                logger.debug("Executing: {} with values {}", query, formatAllValues(values));
+            if (logger.isTraceEnabled())
+                logger.trace("Executing: {} with values {}", query, formatAllValues(values));
             if (reusePrepared)
             {
                 rs = QueryProcessor.executeInternal(query, transformValues(values));
@@ -728,14 +728,14 @@ public abstract class CQLTester
         else
         {
             query = replaceValues(query, values);
-            if (logger.isDebugEnabled())
-                logger.debug("Executing: {}", query);
+            if (logger.isTraceEnabled())
+                logger.trace("Executing: {}", query);
             rs = QueryProcessor.executeOnceInternal(query);
         }
         if (rs != null)
         {
-            if (logger.isDebugEnabled())
-                logger.debug("Got {} rows", rs.size());
+            if (logger.isTraceEnabled())
+                logger.trace("Got {} rows", rs.size());
         }
         return rs;
     }

From 01ae2794e5f3f33d8755cb913f11d917cf7e6bd7 Mon Sep 17 00:00:00 2001
From: Tyler Hobbs <tylerlhobbs@gmail.com>
Date: Wed, 17 Aug 2016 17:03:30 -0500
Subject: [PATCH 3/3] Ninja: temporarily remove test-clientutil-jar from
 test-all

This is a temporary measure to fix test-all until CASSANDRA-11635 can be
properly fixed and allow test-clientutil-jar to work again.
---
 build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index acc7c9ee95..532c944456 100644
--- a/build.xml
+++ b/build.xml
@@ -1442,7 +1442,7 @@
   </target>
 
   <target name="test-all" 
-          depends="eclipse-warnings,test,long-test,test-compression,test-clientutil-jar" 
+          depends="eclipse-warnings,test,long-test,test-compression" 
           description="Run all tests except for those under test-burn" />
   
   <!-- Use JaCoCo ant extension without needing externally saved lib -->