diff options
| author | Adrian Likins <alikins@grimlock.devel.redhat.com> | 2008-02-29 14:27:43 -0500 |
|---|---|---|
| committer | Adrian Likins <alikins@grimlock.devel.redhat.com> | 2008-02-29 14:27:43 -0500 |
| commit | 9fd0d907c5893780f2baab0e9733e4a00ce75e98 (patch) | |
| tree | bcd72d1ff053968897e95f71d7a22be7951af260 /etc | |
| parent | dd4a2266e476410084556ea7bce9dfa47e651690 (diff) | |
| parent | bdc3f700d2ddee513173cd3ae6a82de11011bf84 (diff) | |
| download | third_party-func-9fd0d907c5893780f2baab0e9733e4a00ce75e98.tar.gz third_party-func-9fd0d907c5893780f2baab0e9733e4a00ce75e98.tar.xz third_party-func-9fd0d907c5893780f2baab0e9733e4a00ce75e98.zip | |
Merge commit 'origin/devel' into devel
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/minion.conf | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/etc/minion.conf b/etc/minion.conf index f2e2b34..00ff009 100644 --- a/etc/minion.conf +++ b/etc/minion.conf @@ -2,7 +2,5 @@ [main] log_level = DEBUG -certmaster = certmaster -cert_dir = /etc/pki/func acl_dir = /etc/func/minion-acl.d |