aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Meusel <tim@bastelfreak.de>2018-03-15 17:18:10 +0100
committerGitHub <noreply@github.com>2018-03-15 17:18:10 +0100
commit8cb66113e716e3e0d85e48f8558808129508ca6d (patch)
tree18a2e881128c9e15ae47806c540672fd5064ef2b
parenta844e2f43430929228950a4565222c13760a748a (diff)
parentae73136851004095c36b5e8f42efc5c318bfb654 (diff)
downloadpuppet-ferm-8cb66113e716e3e0d85e48f8558808129508ca6d.tar.gz
puppet-ferm-8cb66113e716e3e0d85e48f8558808129508ca6d.tar.bz2
Merge pull request #8 from voxpupuli/rel111
release 1.1.1
-rw-r--r--CHANGELOG.md13
-rw-r--r--metadata.json2
2 files changed, 5 insertions, 10 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ec65d5..142a9ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,9 +4,9 @@ All notable changes to this project will be documented in this file.
Each new release typically also includes the latest modulesync defaults.
These should not affect the functionality of the module.
-## [v1.1.0](https://github.com/voxpupuli/puppet-ferm/tree/v1.1.0) (2018-02-26)
+## [v1.1.1](https://github.com/voxpupuli/puppet-ferm/tree/v1.1.1) (2018-03-15)
-[Full Changelog](https://github.com/voxpupuli/puppet-ferm/compare/v1.0.0...v1.1.0)
+[Full Changelog](https://github.com/voxpupuli/puppet-ferm/compare/2d355a4c1baadc761d6b12645d0274da8866f722...v1.1.1)
**Implemented enhancements:**
@@ -14,14 +14,9 @@ These should not affect the functionality of the module.
**Merged pull requests:**
+- add notice about older releases [\#7](https://github.com/voxpupuli/puppet-ferm/pull/7) ([bastelfreak](https://github.com/bastelfreak))
+- Release 1.1.0 [\#4](https://github.com/voxpupuli/puppet-ferm/pull/4) ([bastelfreak](https://github.com/bastelfreak))
- release 1.0.0 [\#2](https://github.com/voxpupuli/puppet-ferm/pull/2) ([bastelfreak](https://github.com/bastelfreak))
-
-## [v1.0.0](https://github.com/voxpupuli/puppet-ferm/tree/v1.0.0) (2018-02-22)
-
-[Full Changelog](https://github.com/voxpupuli/puppet-ferm/compare/2c1be5b9f0413e27f0fceed71b1776a263356758...v1.0.0)
-
-**Merged pull requests:**
-
- modulesync 1.8.0 [\#1](https://github.com/voxpupuli/puppet-ferm/pull/1) ([bastelfreak](https://github.com/bastelfreak))
diff --git a/metadata.json b/metadata.json
index a2992cf..f33a0c8 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
{
"name": "puppet-ferm",
- "version": "1.1.1-rc0",
+ "version": "1.1.1",
"author": "Vox Pupuli",
"summary": "deploy and manage ferm",
"license": "AGPL-3.0",