diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-10-17 12:25:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-17 12:25:57 +0200 |
| commit | 7e0b620110d99f328843b61a201f5a0d75d3e2cb (patch) | |
| tree | defd2d673bceddda6b0f0f760565bdce0cf58d31 /messagebus | |
| parent | 2570a612aff08cf3116a68c4a266c7b141e723a4 (diff) | |
| parent | 81aa88dc8eee9ed7573c819d96a4900b402c3456 (diff) | |
Merge branch 'master' into balder/remove-searchxxxpolicy
Diffstat (limited to 'messagebus')
| -rwxr-xr-x | messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetworkParams.java | 2 | ||||
| -rw-r--r-- | messagebus/src/tests/oospolicy/.gitignore | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetworkParams.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetworkParams.java index ae58afe6be0..0d4cee5a939 100755 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetworkParams.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetworkParams.java @@ -15,7 +15,6 @@ public class RPCNetworkParams { private Identity identity = new Identity(""); private String slobrokConfigId = "admin/slobrok.0"; private SlobroksConfig slobroksConfig = null; - private String oosServerPattern = ""; private int listenPort = 0; private int maxInputBufferSize = 256 * 1024; private int maxOutputBufferSize = 256 * 1024; @@ -37,7 +36,6 @@ public class RPCNetworkParams { identity = new Identity(params.identity); slobrokConfigId = params.slobrokConfigId; slobroksConfig = params.slobroksConfig; - oosServerPattern = params.oosServerPattern; listenPort = params.listenPort; connectionExpireSecs = params.connectionExpireSecs; maxInputBufferSize = params.maxInputBufferSize; diff --git a/messagebus/src/tests/oospolicy/.gitignore b/messagebus/src/tests/oospolicy/.gitignore deleted file mode 100644 index 3bd6e47e0bc..00000000000 --- a/messagebus/src/tests/oospolicy/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -.depend -Makefile -oospolicy_test |