Skip to content

Commit ae7ed0d

Browse files
author
willmeek
authored
Merge pull request #847 from puppetlabs/maint_modsync_1d81b6a
(maint) - modulesync 1d81b6a
2 parents 24ce474 + 64567a1 commit ae7ed0d

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ matrix:
2222
script: bundle exec rake beaker
2323
services: docker
2424
sudo: required
25-
- rvm: 2.4.0
25+
- rvm: 2.4.1
2626
bundler_args: --without system_tests
2727
env: PUPPET_GEM_VERSION="~> 5.0"
2828
- rvm: 2.1.9

spec/spec_helper.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
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
# put local configuration and setup into spec_helper_local
55
begin
66
require 'spec_helper_local'
7-
rescue LoadError
7+
rescue LoadError => loaderror
8+
puts "Could not require spec_helper_local: #{loaderror.message}"
89
end

0 commit comments

Comments
 (0)