aurora-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jco...@apache.org
Subject aurora git commit: Fix broken Thrift benchmark.
Date Wed, 20 Jan 2016 19:08:21 GMT
Repository: aurora
Updated Branches:
  refs/heads/master f02872529 -> 8d3fb2413


Fix broken Thrift benchmark.

Issue introduced with: https://reviews.apache.org/r/42077/.

Reviewed at https://reviews.apache.org/r/42567/


Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/8d3fb241
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/8d3fb241
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/8d3fb241

Branch: refs/heads/master
Commit: 8d3fb2413306387bc533b1b800bbc97149f96b26
Parents: f028725
Author: George Sirois <george.sirois@gmail.com>
Authored: Wed Jan 20 13:08:11 2016 -0600
Committer: Joshua Cohen <jcohen@apache.org>
Committed: Wed Jan 20 13:08:11 2016 -0600

----------------------------------------------------------------------
 .../java/org/apache/aurora/benchmark/ThriftApiBenchmarks.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/aurora/blob/8d3fb241/src/jmh/java/org/apache/aurora/benchmark/ThriftApiBenchmarks.java
----------------------------------------------------------------------
diff --git a/src/jmh/java/org/apache/aurora/benchmark/ThriftApiBenchmarks.java b/src/jmh/java/org/apache/aurora/benchmark/ThriftApiBenchmarks.java
index 98a124e..293b88f 100644
--- a/src/jmh/java/org/apache/aurora/benchmark/ThriftApiBenchmarks.java
+++ b/src/jmh/java/org/apache/aurora/benchmark/ThriftApiBenchmarks.java
@@ -17,6 +17,7 @@ import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
 import java.util.concurrent.TimeUnit;
 
+import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
 import com.google.gson.Gson;
 import com.google.inject.AbstractModule;
@@ -154,7 +155,8 @@ public class ThriftApiBenchmarks {
             bind(ConfigurationManager.class).toInstance(
                 new ConfigurationManager(
                     ImmutableSet.of(Container._Fields.MESOS),
-                    /* allowDockerParameters */ false));
+                    /* allowDockerParameters */ false,
+                    /* defaultDockerParameters */ ImmutableMultimap.of()));
           }
         },
         new AsyncModule(),


Mime
View raw message