Skip to content
This repository was archived by the owner on Sep 19, 2019. It is now read-only.

Commit fe7dd74

Browse files
authored
Merge pull request #201 from puppetlabs/maint_modsync_1d81b6a
(maint) - modulesync 1d81b6a
2 parents a56391a + 152a982 commit fe7dd74

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ before_install:
1010
matrix:
1111
fast_finish: true
1212
include:
13-
- rvm: 2.4.0
13+
- rvm: 2.4.1
1414
bundler_args: --without system_tests
1515
env: PUPPET_GEM_VERSION="~> 5.0"
1616
- rvm: 2.1.9

spec/spec_helper.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#This file is generated by ModuleSync, do not edit.
1+
# This file is generated by ModuleSync, do not edit.
22
require 'puppetlabs_spec_helper/module_spec_helper'
33

44
if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
@@ -12,5 +12,6 @@
1212
# put local configuration and setup into spec_helper_local
1313
begin
1414
require 'spec_helper_local'
15-
rescue LoadError
15+
rescue LoadError => loaderror
16+
puts "Could not require spec_helper_local: #{loaderror.message}"
1617
end

0 commit comments

Comments
 (0)