diff options
| author | Antoine Beaupre <anarcat@koumbit.org> | 2009-09-24 12:16:03 -0400 |
|---|---|---|
| committer | Antoine Beaupre <anarcat@koumbit.org> | 2009-09-24 12:16:03 -0400 |
| commit | 343f27fa91865c0c20f633f36048f8d61179fb02 (patch) | |
| tree | ecc6f2e8aa1616d04d4cc6e550ff35fec9b34f44 /manifests/init.pp | |
| parent | de010623a8594900b9661db9c0dc8707a1e402fe (diff) | |
| parent | 70cae2f75b1938ac26a75597a8e75dc3e7d327b7 (diff) | |
| download | puppet-backupninja-343f27fa91865c0c20f633f36048f8d61179fb02.tar.gz puppet-backupninja-343f27fa91865c0c20f633f36048f8d61179fb02.tar.bz2 | |
Merge commit 'micah/master'
Conflicts:
manifests/mysql.pp
manifests/rdiff.pp
manifests/server.pp
Diffstat (limited to 'manifests/init.pp')
| -rw-r--r-- | manifests/init.pp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/manifests/init.pp b/manifests/init.pp index 8ed54e3..23b4268 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -1,5 +1,16 @@ -import "*.pp" +import "client.pp" +import "config.pp" +import "dup.pp" +import "labelmount.pp" +import "maildir.pp" +import "mysql.pp" +import "rdiff.pp" +import "server.pp" +import "sh.pp" +import "svn.pp" +import "sys.pp" class backupninja { } + |