fix(pipeline-templates): Fix trigger merging when hydrating templates. (

#2081)
spinnaker · Mar 22, 2018 · 80a9f75 · 80a9f75
1 parent 4af35a7
commit 80a9f75
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...a/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/TemplatedPipelineModelMutator.java b/...a/com/netflix/spinnaker/orca/pipelinetemplate/v1schema/TemplatedPipelineModelMutator.java
@@ -127,7 +127,7 @@ private void applyConfigurations(PipelineConfiguration configuration, Map<String
     if (configuration.getTriggers() != null && !configuration.getTriggers().isEmpty()) {
       pipeline.put(
         "triggers",
-        TemplateMerge.mergeNamedContent(
+        TemplateMerge.mergeDistinct(
           pipelineTemplateObjectMapper.convertValue(pipeline.get("triggers"), new TypeReference<List<NamedHashMap>>() {}),
           configuration.getTriggers()
         )