Merge pull request #55 from voxpupuli/modulesync

modulesync 0.16.11 & Release 1.1.0
voxpupuli · Feb 10, 2017 · 30b347d · 30b347d
2 parents 7cf9fd9 + 21c41e7
commit 30b347d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/.msync.yml b/.msync.yml
@@ -1 +1 @@
-modulesync_config_version: '0.16.8'
+modulesync_config_version: '0.16.11'
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -518,3 +518,7 @@ RSpec/RepeatedDescription:
 
 RSpec/NestedGroups:
   Enabled: False
+
+# disable Yaml safe_load. This is needed to support ruby2.0.0 development envs
+Security/YAMLLoad:
+  Enabled: false
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,7 @@ before_install:
   - bundle -v
   - rm Gemfile.lock || true
   - gem update --system
-  - gem update bundler
+  - gem install bundler -v '~>1.13.0'
   - gem --version
   - bundle -v
 script:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2017-02-11 Release 1.1.0
+
+This is the last release with Puppet3 support!
+* Modulesync with latest Vox Pupuli defaults
+
 ## 2016-12-25 Release 1.0.2
 
 * Modulesync with latest Vox Pupuli defaults

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppet-alternatives",
-  "version": "1.0.3-rc0",
+  "version": "1.1.0",
   "author": "Vox Pupuli",
   "summary": "Maintain symbolic links determining default commands",
   "license": "Apache-2.0",