summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2019-08-12 22:29:08 +0200
committerGitHub <noreply@github.com>2019-08-12 22:29:08 +0200
commit65f9ad5295238efcf2e360fd1c454baf37458ed6 (patch)
treeacf05c303600e7a9f43607f1ec985e1e3c042c18
parent7a7d8c9a16fcfc9d8007f27ffd5c20d52813aad5 (diff)
parente13a88ef07f40ee2c616cfba35d6b2d1af13f02e (diff)
Merge pull request #10240 from vespa-engine/revert-10233-bjorncs/java-dispatch
Revert "Enable Java dispatch by default"
-rw-r--r--flags/src/main/java/com/yahoo/vespa/flags/Flags.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
index f2955e60f48..3d82be9b65d 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -82,7 +82,7 @@ public class Flags {
NODE_TYPE, APPLICATION_ID, HOSTNAME);
public static final UnboundBooleanFlag USE_FDISPATCH_BY_DEFAULT = defineFeatureFlag(
- "use-fdispatch-by-default", false,
+ "use-fdispatch-by-default", true,
"Should fdispatch be used as the default instead of the java dispatcher",
"Takes effect at redeployment",
APPLICATION_ID);
@@ -94,7 +94,7 @@ public class Flags {
APPLICATION_ID);
public static final UnboundBooleanFlag DISPATCH_WITH_PROTOBUF = defineFeatureFlag(
- "dispatch-with-protobuf", true,
+ "dispatch-with-protobuf", false,
"Should the java dispatcher use protobuf/jrt as the default",
"Takes effect at redeployment",
APPLICATION_ID);