diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2014-10-21 14:53:58 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2014-10-21 14:53:58 -0500 |
| commit | c91af1486d2969d9938f9f11050b818d825326f3 (patch) | |
| tree | 9200ecd0c7492ebf14263452d05df79d7cd93036 /src/lib/Bcfg2/Options.py | |
| parent | 8ce802c5f6f1d8de00108ecf5e3ff6eeeff3ccd1 (diff) | |
| parent | a2b8b3282bc07e1db362d2edd51d2bee3e425d57 (diff) | |
| download | bcfg2-c91af1486d2969d9938f9f11050b818d825326f3.tar.gz bcfg2-c91af1486d2969d9938f9f11050b818d825326f3.tar.bz2 bcfg2-c91af1486d2969d9938f9f11050b818d825326f3.zip | |
Merge branch 'ssl-protocol-fix' of github.com:solj/bcfg2 into maint
Diffstat (limited to 'src/lib/Bcfg2/Options.py')
| -rw-r--r-- | src/lib/Bcfg2/Options.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Options.py b/src/lib/Bcfg2/Options.py index 810a726ac..9752ab758 100644 --- a/src/lib/Bcfg2/Options.py +++ b/src/lib/Bcfg2/Options.py @@ -1304,6 +1304,7 @@ CLIENT_COMMON_OPTIONS = \ drivers=CLIENT_DRIVERS, dryrun=CLIENT_DRYRUN, paranoid=CLIENT_PARANOID, + protocol=SERVER_PROTOCOL, ppath=PARANOID_PATH, max_copies=PARANOID_MAX_COPIES, bundle=CLIENT_BUNDLE, |