From f0b6c01cf0df4cc54e08e925194a8652e01f612f Mon Sep 17 00:00:00 2001 From: Frank Wall Date: Fri, 17 Apr 2015 22:50:03 +0200 Subject: [PATCH] release v1.2.0 --- CHANGELOG.md | 4 ++++ metadata.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 888dc4f..229d37f 100644 --- 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 index a9f10b2..e354964 100644 --- 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",