From 8dfc7a4b82a69fc7d70f9cdf2c532efe377d496d Mon Sep 17 00:00:00 2001 From: Jan Graichen Date: Fri, 1 May 2020 16:35:40 +0200 Subject: [PATCH] Update CHANGELOG --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 294929b..61a431c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [Unreleased] +### Added +- Added `merge-last`, `merge-first`, `remove` and `overwrite` merge strategies for dictionaries ## [1.2.0] - 2020-01-31 ### Added @@ -22,6 +24,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - First version of ext pillar - Yamlet and Text renderer -[Unreleased]: https://github.com/jgraichen/salt-tower/compare/v1.2.0...HEAD +[unreleased]: https://github.com/jgraichen/salt-tower/compare/v1.2.0...HEAD [1.2.0]: https://github.com/jgraichen/salt-tower/compare/v1.1.0...v1.2.0 [1.1.0]: https://github.com/jgraichen/salt-tower/compare/v1.0.0...v1.1.0