Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #11 from jwaldrop/upgrade_thrift_plugin

Upgrade thrift plugin
  • Loading branch information...
commit 3fc5244fabb61c6927835cc65f76659f63e7b459 2 parents 8ed7d9b + 70cd896
@jwaldrop jwaldrop authored
View
1  README.md
@@ -453,6 +453,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>
View
20 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>
@@ -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>
View
2  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
View
2  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
View
4 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()
}
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.