Module sync 1d81b6a

diff --git a/.travis.yml b/.travis.yml
index 98fc61954dff7cedcc805a801eebe83156a88454..adc67f385a3e9eb83ef8f9a21f536766017ff9fa 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,7 @@ matrix:
     script: bundle exec rake beaker
     services: docker
     sudo: required
-  - rvm: 2.4.0
+  - rvm: 2.4.1
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 5.0"
   - rvm: 2.1.9

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 05732d4f24ab190939d0e9f0b51a9b0a521fa09c..c80809201b72b1811fb9cade84e826c9e2949650 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-#This file is generated by ModuleSync, do not edit.
+# This file is generated by ModuleSync, do not edit.
 require 'puppetlabs_spec_helper/module_spec_helper'
 
 if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
@@ -12,5 +12,6 @@ end
 # put local configuration and setup into spec_helper_local
 begin
   require 'spec_helper_local'
-rescue LoadError
+rescue LoadError => loaderror
+  puts "Could not require spec_helper_local: #{loaderror.message}"
 end