diff options
| author | Jack Neely <jjneely@ncsu.edu> | 2011-06-22 13:37:58 -0400 |
|---|---|---|
| committer | Jack Neely <jjneely@ncsu.edu> | 2011-06-22 13:37:58 -0400 |
| commit | b848b5303c21c2dcb3d3c52e260944676864e332 (patch) | |
| tree | d1969c51a20a227b42ffb4c077ba1df79d784240 /man/bcfg2.conf.5 | |
| parent | 9d0c43a54e4172061af2779336b821bb93fefc71 (diff) | |
| parent | 1186eae0c62ba6810ea597083bd8e56d487811c0 (diff) | |
| download | bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.tar.gz bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.tar.bz2 bcfg2-b848b5303c21c2dcb3d3c52e260944676864e332.zip | |
Merge branch 'master' into yumng
Conflicts:
src/lib/Client/Tools/YUMng.py
Diffstat (limited to 'man/bcfg2.conf.5')
| -rw-r--r-- | man/bcfg2.conf.5 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5 index 786f69f9a..7cd04a0b7 100644 --- a/man/bcfg2.conf.5 +++ b/man/bcfg2.conf.5 @@ -379,6 +379,11 @@ Communication protocol to use. Defaults to xmlrpc/ssl. A client-only option. Number of times to retry network communication. .TP +.B serverCommonNames +A client-only option. A colon-separated list of Common Names the client +will accept in the SSL certificate presented by the server. + +.TP .B user A client-only option. The UUID of the client. |