Merge pull request #113 from puppetlabs/release

3.2.0 Mergeback

Author: david22swan

.travis.yml

@@ -1,32 +1,49 @@
-#This file is generated by ModuleSync, do not edit.
 ---
-sudo: false
+dist: trusty
 language: ruby
 cache: bundler
-script: "bundle exec rake release_checks"
+before_install:
+  - bundle -v
+  - rm -f Gemfile.lock
+  - gem update --system $RUBYGEMS_VERSION
+  - gem --version
+  - bundle -v
+script:
+  - 'bundle exec rake $CHECK'
+bundler_args: --without system_tests
+rvm:
+  - 2.5.1
+env:
+  global:
+    - BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0"
 matrix:
   fast_finish: true
   include:
-  - rvm: 2.3.1
-    dist: trusty
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
-    script: bundle exec rake beaker
-    services: docker
-    sudo: required
-  - rvm: 2.3.1
-    dist: trusty
-    env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
-    script: bundle exec rake beaker
-    services: docker
-    sudo: required
-  - rvm: 2.5.1
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 6.0"
-  - rvm: 2.4.1
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 5.0"
-  - rvm: 2.1.9
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 4.0"
+    -
+      bundler_args: 
+      dist: trusty
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply
+      rvm: 2.5.1
+      script: bundle exec rake beaker
+      services: docker
+      sudo: required
+    -
+      bundler_args: 
+      dist: trusty
+      env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
+      rvm: 2.5.1
+      script: bundle exec rake beaker
+      services: docker
+      sudo: required
+    -
+      env: CHECK=parallel_spec
+    -
+      env: PUPPET_GEM_VERSION="~> 5.0" CHECK=parallel_spec
+      rvm: 2.4.4
+branches:
+  only:
+    - master
+    - /^v\d/
+    - release
 notifications:
   email: false

CHANGELOG.md

@@ -1,3 +1,10 @@
+## Unsupported Release 3.2.0
+### Summary
+This is a moderate release that serves to increases the maximum compatible puppet version from `5.x` to `6.x`.
+
+#### Added
+- Maximum compatible puppet version has been increased from from `5.x` to `6.x`.
+
 ## Unsupported Release 3.1.0
 ### Summary
 This is a moderate release that serves to increases the maximum compatible version of stdlib from `5.0.0` to `6.0.0`.

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-xinetd",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "author": "puppetlabs",
   "summary": "Configures xinetd and exposes the xinetd::service definition for adding new services.",
   "license": "Apache-2.0",