1
0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-01-18 05:18:24 +02:00

Merge remote-tracking branch 'github/master' into HEAD

This commit is contained in:
Marcus Holl 2018-09-12 11:02:24 +02:00
commit 9c4652ddab

View File

@ -23,13 +23,4 @@ class ConfigurationMerger {
merged = merge(parameters, parameterKeys, merged) merged = merge(parameters, parameterKeys, merged)
return merged return merged
} }
@NonCPS
static Map merge(
def script, def stepName,
Map parameters, Set parameterKeys,
Set stepConfigurationKeys
) {
merge(script, stepName, parameters, parameterKeys, [:], stepConfigurationKeys)
}
} }