Merge pull request #113 from voxpupuli/modulesync

Modulesync 0.16.11 & Release 2.3.0
voxpupuli · Feb 11, 2017 · fd01fcf · fd01fcf
2 parents fd42cf5 + 58bb30a
commit fd01fcf
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 4 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,3 +1,16 @@
+# Changelog
+
+## 2017-02-11 Release 2.3.0
+
+This is the last release with Puppet3 support!
+* Make facts.sh sh compatible
+* Add additional parameter data_dir for seperate data from home user directory
+* Make confluence_version a First Class Fact
+* Allow System Group
+* Use https instead of http for downloading confluence
+* Bump puppet minimum version_requirement to 3.8.7
+* Add support for configuring an AJP connector
+
 ## 2016-08-18 Release 2.2.2
 
 * Fix: Issue with a clean puppet 4 based install failure.

diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppet-confluence",
-  "version": "2.2.3-rc0",
+  "version": "2.3.0",
   "author": "Vox Pupuli",
   "summary": "Install atlassian confluence",
   "license": "MIT",
@@ -25,7 +25,7 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">=3.8.7 < 5.0.0"
+      "version_requirement": ">= 3.8.7 < 5.0.0"
     }
   ],
   "operatingsystem_support": [