From 0524fd964e43f9e41bdf6fc450312c35e78d0c2b Mon Sep 17 00:00:00 2001
From: James Waldrop <jw@twitter.com>
Date: Thu, 2 Aug 2012 10:16:37 -0700
Subject: [PATCH 1/6] Updating to latest Util / Finagle / Ostrich

---
 pom.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5155dd6..85913cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,47 +68,47 @@
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>finagle-http</artifactId>
-      <version>5.3.0</version>
+      <version>5.3.4</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>finagle-kestrel</artifactId>
-      <version>5.3.0</version>
+      <version>5.3.4</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>finagle-memcached</artifactId>
-      <version>5.3.0</version>
+      <version>5.3.4</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>finagle-ostrich4</artifactId>
-      <version>5.3.0</version>
+      <version>5.3.4</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>finagle-thrift</artifactId>
-      <version>5.3.0</version>
+      <version>5.3.4</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>ostrich</artifactId>
-      <version>8.2.0</version>
+      <version>8.2.3</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>util-core</artifactId>
-      <version>5.3.0</version>
+      <version>5.3.6</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>util-eval</artifactId>
-      <version>5.2.0</version>
+      <version>5.3.6</version>
     </dependency>
     <dependency>
       <groupId>com.twitter</groupId>
       <artifactId>util-logging</artifactId>
-      <version>5.2.0</version>
+      <version>5.3.6</version>
     </dependency>
     <!-- Test -->
     <dependency>

From 8662a73e3690a9a79be131cd4a223ec7e57329ff Mon Sep 17 00:00:00 2001
From: James Waldrop <jw@twitter.com>
Date: Sun, 5 Aug 2012 05:38:43 -0700
Subject: [PATCH 2/6] Fixes integration test exception

---
 .../scala/com/twitter/parrot/integration/EndToEndSpec.scala   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/test/scala/com/twitter/parrot/integration/EndToEndSpec.scala b/src/test/scala/com/twitter/parrot/integration/EndToEndSpec.scala
index 7009fd2..275e19a 100644
--- a/src/test/scala/com/twitter/parrot/integration/EndToEndSpec.scala
+++ b/src/test/scala/com/twitter/parrot/integration/EndToEndSpec.scala
@@ -63,8 +63,8 @@ class EndToEndSpec extends SpecificationWithJUnit {
         case e: Exception => fail(e.getMessage)
       }
       finally {
+        // Feeder will shutdown Server
         feeder.shutdown()
-        server.shutdown()
       }
     }
 
@@ -102,8 +102,8 @@ class EndToEndSpec extends SpecificationWithJUnit {
         case e: Exception => fail(e.getMessage)
       }
       finally {
+        // Feeder will shutdown Server
         feeder.shutdown()
-        server.shutdown()
       }
     }
   }

From 5398509e8f182d284387b333ddfce085a6553f04 Mon Sep 17 00:00:00 2001
From: James Waldrop <jw@twitter.com>
Date: Thu, 9 Aug 2012 10:12:26 -0700
Subject: [PATCH 3/6] Fixes non-Ubuntu compatible shell scripts

---
 src/main/resources/scripts/parrot-feeder.sh | 2 +-
 src/main/resources/scripts/parrot-server.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/scripts/parrot-feeder.sh b/src/main/resources/scripts/parrot-feeder.sh
index d24af8f..add052f 100755
--- a/src/main/resources/scripts/parrot-feeder.sh
+++ b/src/main/resources/scripts/parrot-feeder.sh
@@ -21,7 +21,7 @@ DEBUG_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=500
 JAVA_OPTS="-server $GC_OPTS $HEAP_OPTS $PROFILE_OPTS" #$DEBUG_OPTS"
 
 # Used to set JAVA_HOME sanely if not already set.
-function find_java() {
+function find_java {
   if [ ! -z $JAVA_HOME ]; then
     return
   fi
diff --git a/src/main/resources/scripts/parrot-server.sh b/src/main/resources/scripts/parrot-server.sh
index ac87096..79f6884 100755
--- a/src/main/resources/scripts/parrot-server.sh
+++ b/src/main/resources/scripts/parrot-server.sh
@@ -20,7 +20,7 @@ DEBUG_OPTS="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=500
 JAVA_OPTS="-server $GC_OPTS $HEAP_OPTS $PROFILE_OPTS" # $DEBUG_OPTS"
 
 # Used to set JAVA_HOME sanely if not already set.
-function find_java() {
+function find_java {
   if [ ! -z $JAVA_HOME ]; then
     return
   fi

From da632c0d6ff89d4039aa795d94ca2f6b706702ad Mon Sep 17 00:00:00 2001
From: James Waldrop <jw@twitter.com>
Date: Thu, 27 Dec 2012 11:31:59 -0800
Subject: [PATCH 4/6] Clarifies requestRate's interaction with multiple server
 instances

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0a8eb68..3841c28 100644
--- a/README.md
+++ b/README.md
@@ -436,6 +436,7 @@ You can specify any of the following parameters:
     <td><code>requestRate</code></td>
     <td><p>An integer value that specifies the number of requests per second to submit to your service.</p>
     <p><b>Example: </b><code>requestRate = 10</code></p></td>
+    <p>Note: if using multiple server instances, requestRate is per-instance, not aggregate.</p>
     <td><code>1</code></td>
 </tr>
 <tr>

From 32d51299e0412afb9b77ba5e277b751d2b691e5b Mon Sep 17 00:00:00 2001
From: James Waldrop <jw@twitter.com>
Date: Thu, 27 Dec 2012 11:34:45 -0800
Subject: [PATCH 5/6] upgrade to maven-finagle-thrift-plugin 0.0.9

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 85913cd..7974016 100644
--- a/pom.xml
+++ b/pom.xml
@@ -230,7 +230,7 @@
       <plugin>
         <groupId>com.twitter</groupId>
         <artifactId>maven-finagle-thrift-plugin</artifactId>
-        <version>0.0.2</version>
+        <version>0.0.9</version>
         <executions>
           <execution>
             <id>thrift-sources</id>

From 70cd896a91eb6788099381b149e19c880e2169f3 Mon Sep 17 00:00:00 2001
From: James Waldrop <jw@twitter.com>
Date: Thu, 27 Dec 2012 11:42:04 -0800
Subject: [PATCH 6/6] upgrades maven-finagle-thrift-plugin to 0.0.9

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7974016..2b08799 100644
--- a/pom.xml
+++ b/pom.xml
@@ -230,7 +230,7 @@
       <plugin>
         <groupId>com.twitter</groupId>
         <artifactId>maven-finagle-thrift-plugin</artifactId>
-        <version>0.0.9</version>
+        <version>0.0.9</version> 
         <executions>
           <execution>
             <id>thrift-sources</id>