From 068059ab3fe73909e1314e9618fc7f63c3552ca2 Mon Sep 17 00:00:00 2001 From: James Bardin Date: Tue, 2 Aug 2016 09:33:08 -0400 Subject: [PATCH] Add `merge` doc --- website/source/docs/configuration/interpolation.html.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/website/source/docs/configuration/interpolation.html.md b/website/source/docs/configuration/interpolation.html.md index 2d3e42672..91de2341b 100644 --- a/website/source/docs/configuration/interpolation.html.md +++ b/website/source/docs/configuration/interpolation.html.md @@ -193,6 +193,11 @@ The supported built-in functions are: * `map("hello", "world")` * `map("us-east", list("a", "b", "c"), "us-west", list("b", "c", "d"))` + * `merge(map1, map2, ...)` - Returns the union of 2 or more maps. The maps + are consumed in the order provided, and duplciate keys overwrite previous + entries. + * `${merge(map("a", "b"), map("c", "d"))}` returns `{"a": "b", "c": "d"}` + * `md5(string)` - Returns a (conventional) hexadecimal representation of the MD5 hash of the given string.