Merge branch 'master' into freva/deploy-with-internal-restart

# Conflicts:
#	flags/src/main/java/com/yahoo/vespa/flags/Flags.java

1 files changed, 6 insertions, 0 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 411766ccacd..d42521e4f5e 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java
@@ -410,6 +410,12 @@ public class Flags {
             "Takes effect on next deploy from controller",
             APPLICATION_ID, ZONE_ID);
 
+    public static final UnboundLongFlag NODE_OBJECT_CACHE_SIZE = defineLongFlag(
+            "node-object-cache-size",
+            1000,
+            "The number of deserialized Node objects to store in-memory.",
+            "Takes effect on config server restart");
+
     /** WARNING: public for testing: All flags should be defined in {@link Flags}. */
     public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, String description,
                                                        String modificationEffect, FetchVector.Dimension... dimensions) {