Merge pull request #688 from puppetlabs/msync_modules5187

(MODULES-5187) mysnc puppet 5 and ruby 2.4

diff --git a/.sync.yml b/.sync.yml
index 1c79b46b328edb2445998e2d9d9b0d1f17ccb3ac..dd596277d31bc7a8364c03475e78bb6d52347b20 100644 (file)
--- a/.sync.yml
+++ b/.sync.yml
@@ -7,5 +7,8 @@ appveyor.yml:
   - set: docker/ubuntu-14.04
   - set: docker/debian-8
 
+NOTICE:
+  unmanaged: true
+
 spec/spec_helper.rb:
   allow_deprecations: true

diff --git a/.travis.yml b/.travis.yml
index 115691d393be4b1af98560703842c6a9a2cc9937..9af2623346e9f99b2ec1de6c65724024f09610fc 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,10 +22,10 @@ matrix:
     script: bundle exec rake beaker
     services: docker
     sudo: required
-  - rvm: 2.3.1
+  - rvm: 2.4.0
     bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 4.0"
-  - rvm: 2.1.7
+    env: PUPPET_GEM_VERSION="~> 5.0"
+  - rvm: 2.1.9
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 4.0"
 notifications: