Skip to content

Commit

Permalink
Merge pull request #44 from puppetlabs/fix_sync
Browse files Browse the repository at this point in the history
Fix sync
  • Loading branch information
HAIL9000 committed Nov 3, 2016
2 parents 80ee081 + e965907 commit 220f22b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
6 changes: 2 additions & 4 deletions .sync.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
---
.travis.yml:
hipchat: ZnXjXpfn2I11z1/x4DS+o2YnTW5Gll8xMOXvF68HyTQTtJCgIXVzmyq6w1oNAKDBEOm6jWJ6kQA2fD2GSktk+Py0hDkNs232BGDf1nvQ7naBXZMfpkdwVG4hYNR20iirJW5FN2BaqoU8KusForv/Sp6veQkVo7Tw0BjfgFiJKP8=

spec/spec_helper.rb:
  allow_deprecations: true
Gemfile:
optional:
':default':
- gem: hocon
version: '~> 1.1'

spec/spec_helper.rb:
  allow_deprecations: true
8 changes: 0 additions & 8 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
#This file is generated by ModuleSync, do not edit.
require 'puppetlabs_spec_helper/module_spec_helper'

if Puppet.version.to_f >= 4.5
RSpec.configure do |c|
c.before :each do
Puppet.settings[:strict] = :error
end
end
end

# put local configuration and setup into spec_helper_local
begin
require 'spec_helper_local'
Expand Down

0 comments on commit 220f22b

Please sign in to comment.