Merge branch 'master' into bjormel/aws-main-controllerbjormel/aws-main-controller

1 files changed, 3 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/schema/processing/IndexingOutputs.java b/config-model/src/main/java/com/yahoo/schema/processing/IndexingOutputs.java
index 2c24d3e53e1..e4116c3f9d5 100644
--- a/config-model/src/main/java/com/yahoo/schema/processing/IndexingOutputs.java
+++ b/config-model/src/main/java/com/yahoo/schema/processing/IndexingOutputs.java
@@ -1,4 +1,4 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.schema.processing;
 
 import com.yahoo.config.application.api.DeployLogger;
@@ -78,7 +78,8 @@ public class IndexingOutputs extends Processor {
                 return;
             }
             dynamicSummary.add(summaryName);
-        } else if (summaryTransform != SummaryTransform.ATTRIBUTE) {
+        } else if (summaryTransform != SummaryTransform.ATTRIBUTE &&
+                summaryTransform != SummaryTransform.TOKENS) {
             staticSummary.add(summaryName);
         }
     }