release v1.2.0

markt-de · Apr 17, 2015 · f0b6c01 · f0b6c01
1 parent a37dd1b
commit f0b6c01
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.0
+* Feature: Add hiera lookup for `$::proftpd::options` to merge values from multiple hierarchy levels
+* Contributor: cdenneen
+
 ## 1.1.1
 * Bugfix: Fix `LogFormat` and `ExtendedLog` in default configuration
 

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "fraenki-proftpd",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "author": "Frank Wall",
   "summary": "Puppet module to manage ProFTPD",
   "license": "BSD-2-Clause",