summaryrefslogtreecommitdiff
path: root/Puppetfile
diff options
context:
space:
mode:
authorGabriel Filion <gabster@lelutin.ca>2014-12-13 09:34:56 -0500
committerGabriel Filion <gabster@lelutin.ca>2014-12-13 10:21:25 -0500
commit48272434978f95c70e34aebe9ce188157f8f935e (patch)
tree8c940d891cbcba026d56cf8ed2935361debc44fd /Puppetfile
parent7e03247a9e219fe8e57d544957eb06e305e69fc1 (diff)
parent27c9a5dbc2083dcc20d059008702dd3f75382bcc (diff)
Merge remote-tracking branch 'immerda/master' into merge_immerda
Conflicts: manifests/plugins/interfaces.pp $real_ifs was changed on master and we'd like to keep that change $ifs was changed to use the prefix() function and we'd like to keep that change.
Diffstat (limited to 'Puppetfile')
-rw-r--r--Puppetfile5
1 files changed, 5 insertions, 0 deletions
diff --git a/Puppetfile b/Puppetfile
new file mode 100644
index 0000000..3e03b30
--- /dev/null
+++ b/Puppetfile
@@ -0,0 +1,5 @@
+forge 'https://forge.puppetlabs.com'
+
+mod 'puppetlabs/stdlib', '>=3.2.0'
+mod 'puppetlabs/concat', '>=1.0.0'
+mod 'duritong/openbsd', '>=0.0.1'