Update CHANGELOG

openhpi-cloud · May 1, 2020 · 8dfc7a4 · 8dfc7a4
1 parent ce6f879
commit 8dfc7a4
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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