diff options
| author | Yasser Nabi <yassersaleemi@gmail.com> | 2014-07-10 19:37:40 +0100 |
|---|---|---|
| committer | Yasser Nabi <yassersaleemi@gmail.com> | 2014-07-10 19:37:40 +0100 |
| commit | 7a3748a089848db18ed474f6e6fdb8caffa5a238 (patch) | |
| tree | e04930c2df1f8d67a7ed21449c10280393b9171d /manifests/params.pp | |
| parent | 9fcacf58190007e27b01e623f91a63ad481bc43e (diff) | |
| parent | 18a16ca041469d99bc0c5d27c46db62a06903ed8 (diff) | |
Merge branch 'master' of github.com:yasn77/puppet-rsyslog
Conflicts:
templates/client.conf.erb
templates/rsyslog.conf.erb
Diffstat (limited to 'manifests/params.pp')
0 files changed, 0 insertions, 0 deletions