summaryrefslogtreecommitdiffstats
path: root/man/bcfg2.conf.5
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-07-27 17:19:47 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-07-27 17:19:47 -0500
commitaa230853296cd3b69f0296d646daf37b4b2cd764 (patch)
tree8ad1a2e8ee5f05ef775c2536984440a0cc74ec78 /man/bcfg2.conf.5
parent08f5ad7e1b470b79ce81130b2f299426b132db80 (diff)
parent3435963a7c715bd3e6e912c6224fc8b893b1abe4 (diff)
downloadbcfg2-aa230853296cd3b69f0296d646daf37b4b2cd764.tar.gz
bcfg2-aa230853296cd3b69f0296d646daf37b4b2cd764.tar.bz2
bcfg2-aa230853296cd3b69f0296d646daf37b4b2cd764.zip
Merge branch 'maint'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com> Conflicts: doc/appendix/guides/ubuntu.txt src/lib/Bcfg2/Options.py src/lib/Bcfg2/Server/Plugins/Packages/Yum.py src/lib/Bcfg2/settings.py
Diffstat (limited to 'man/bcfg2.conf.5')
-rw-r--r--man/bcfg2.conf.59
1 files changed, 8 insertions, 1 deletions
diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5
index 85e2f4b98..5e64caae9 100644
--- a/man/bcfg2.conf.5
+++ b/man/bcfg2.conf.5
@@ -1,4 +1,4 @@
-.TH "BCFG2.CONF" "5" "June 19, 2013" "1.3" "Bcfg2"
+.TH "BCFG2.CONF" "5" "July 19, 2013" "1.3" "Bcfg2"
.SH NAME
bcfg2.conf \- Configuration parameters for Bcfg2
.
@@ -76,6 +76,13 @@ pseudo
.UNINDENT
.UNINDENT
.TP
+.B fam_blocking
+.
+Whether the server should block at startup until the file monitor
+backend has processed all events. This can cause a slower startup,
+but ensure that all files are recognized before the first client
+is handled.
+.TP
.B ignore_files
A comma\-separated list of globs that should be ignored by the file
monitor. Default values are: