projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into zobel-salsa
[mirror/dsa-puppet.git]
/
3rdparty
/
modules
/
concat
/
spec
/
spec_helper.rb
diff --git
a/3rdparty/modules/concat/spec/spec_helper.rb
b/3rdparty/modules/concat/spec/spec_helper.rb
index
2c6f566
..
22d5d68
100644
(file)
--- a/
3rdparty/modules/concat/spec/spec_helper.rb
+++ b/
3rdparty/modules/concat/spec/spec_helper.rb
@@
-1
+1,8
@@
+#This file is generated by ModuleSync, do not edit.
require 'puppetlabs_spec_helper/module_spec_helper'
require 'puppetlabs_spec_helper/module_spec_helper'
+
+# put local configuration and setup into spec_helper_local
+begin
+ require 'spec_helper_local'
+rescue LoadError
+end