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:
requestRate |
An integer value that specifies the number of requests per second to submit to your service.
Example: requestRate = 10 |
+ Note: if using multiple server instances, requestRate is per-instance, not aggregate.
1 |
diff --git a/pom.xml b/pom.xml
index 5155dd6..2b08799 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,47 +68,47 @@
com.twitter
finagle-http
- 5.3.0
+ 5.3.4
com.twitter
finagle-kestrel
- 5.3.0
+ 5.3.4
com.twitter
finagle-memcached
- 5.3.0
+ 5.3.4
com.twitter
finagle-ostrich4
- 5.3.0
+ 5.3.4
com.twitter
finagle-thrift
- 5.3.0
+ 5.3.4
com.twitter
ostrich
- 8.2.0
+ 8.2.3
com.twitter
util-core
- 5.3.0
+ 5.3.6
com.twitter
util-eval
- 5.2.0
+ 5.3.6
com.twitter
util-logging
- 5.2.0
+ 5.3.6
@@ -230,7 +230,7 @@
com.twitter
maven-finagle-thrift-plugin
- 0.0.2
+ 0.0.9
thrift-sources
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
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()
}
}
}