diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-12-09 09:38:04 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-12-09 09:38:04 -0500 |
| commit | 7497f20a4821515fc9c8dadf85d3c4f3b47245eb (patch) | |
| tree | be129aa775852ed70bac6be82af719b9bfc7901f /tools | |
| parent | eff366a0c3b9ba87f3ee06f90dccdd242579b7b1 (diff) | |
| parent | bf2ee31f956447fa42ae85dc69820405eda8c490 (diff) | |
| download | bcfg2-7497f20a4821515fc9c8dadf85d3c4f3b47245eb.tar.gz bcfg2-7497f20a4821515fc9c8dadf85d3c4f3b47245eb.tar.bz2 bcfg2-7497f20a4821515fc9c8dadf85d3c4f3b47245eb.zip | |
Merge branch 'maint'
Conflicts:
doc/appendix/guides/fedora.txt
misc/bcfg2.spec
schemas/types.xsd
src/lib/Bcfg2/Encryption.py
src/lib/Bcfg2/Options.py
src/lib/Bcfg2/Server/Admin/Client.py
src/lib/Bcfg2/Server/Core.py
src/lib/Bcfg2/Server/Lint/Validate.py
src/lib/Bcfg2/Server/Plugin/helpers.py
src/lib/Bcfg2/Server/Plugins/Bundler.py
src/lib/Bcfg2/Server/Plugins/Cfg/CfgEncryptedGenerator.py
src/lib/Bcfg2/Server/Plugins/Probes.py
src/sbin/bcfg2-crypt
testsuite/Testsrc/Testlib/TestServer/TestPlugin/Testhelpers.py
testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestCfg/TestCfgEncryptedGenerator.py
testsuite/Testsrc/Testlib/TestServer/TestPlugins/TestProbes.py
testsuite/common.py
testsuite/install.sh
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/bcfg2-cron | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/bcfg2-cron b/tools/bcfg2-cron index fe0e6e90d..9a93c2e44 100755 --- a/tools/bcfg2-cron +++ b/tools/bcfg2-cron @@ -1,6 +1,6 @@ #!/bin/sh # -# Script to run bcfg2 with cron. +# Script to run bcfg2 with cron. # # This script is designed so that bcfg2-cron can be invoked from both # /etc/cron.daily and /etc/cron.hourly. This allows the administrators to |