diff options
author | Micah <micah@riseup.net> | 2015-02-28 16:44:30 +0000 |
---|---|---|
committer | Micah <micah@riseup.net> | 2015-02-28 16:44:30 +0000 |
commit | bf746f2f9caacd869a252c7f09cde93c0e577e09 (patch) | |
tree | e7c2d4161b529967079d20ff4f81e5c118cf1a67 /manifests/moduledir | |
parent | ac5da1df281e636ecffe260b681e8119a1057e1d (diff) | |
parent | c6beeb1718608389e027d287c7a8ddd586313df2 (diff) | |
download | puppet-common-bf746f2f9caacd869a252c7f09cde93c0e577e09.tar.gz puppet-common-bf746f2f9caacd869a252c7f09cde93c0e577e09.tar.bz2 |
Merge branch 'master' into 'master'
Merge with immerda
See merge request !1
Diffstat (limited to 'manifests/moduledir')
-rw-r--r-- | manifests/moduledir/common.pp | 3 | ||||
-rw-r--r-- | manifests/moduledir/common/cf.pp | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/manifests/moduledir/common.pp b/manifests/moduledir/common.pp index c615f84..e74c601 100644 --- a/manifests/moduledir/common.pp +++ b/manifests/moduledir/common.pp @@ -1,3 +1,4 @@ +# setup a common dir class common::moduledir::common{ - module_dir{'common': } + common::module_dir{'common': } } diff --git a/manifests/moduledir/common/cf.pp b/manifests/moduledir/common/cf.pp deleted file mode 100644 index b3c089b..0000000 --- a/manifests/moduledir/common/cf.pp +++ /dev/null @@ -1,4 +0,0 @@ -class common::moduledir::common::cf { - include ::common::moduledir::common - module_dir{'common/cf': } -} |