diff options
| author | Gabriel Filion <lelutin@gmail.com> | 2013-01-02 12:14:12 -0500 |
|---|---|---|
| committer | Gabriel Filion <lelutin@gmail.com> | 2013-01-02 12:14:12 -0500 |
| commit | 560b7c829e8ec043cf603fd6b1e2a1d3e0946a63 (patch) | |
| tree | 420db02979146e6c14cf57701e1541e7b97649df /manifests/puppetmaster/base.pp | |
| parent | aaf7ffad90958aff6e068c0496bd5f91e8759e4d (diff) | |
| parent | 87b8cf7133beb4c9dd6f6e7692d374d302f8ea5a (diff) | |
Merge branch 'puppet_cron'
Conflicts:
manifests/cron.pp
manifests/linux.pp
take the changes from puppet_cron
Diffstat (limited to 'manifests/puppetmaster/base.pp')
0 files changed, 0 insertions, 0 deletions