diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2015-07-23 12:03:29 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2015-07-23 12:03:29 -0500 |
| commit | c11fcd8110e537db70bf40b91ed14467184b0e1c (patch) | |
| tree | e2a39e6d2d7b5841cf71c21b07cd0cffb1fe21da /doc | |
| parent | 49ab865657f03795139e95490b1978fcceca2f41 (diff) | |
| parent | 9d5524f345279a6fb6042ea5acd519549cabe5b7 (diff) | |
| download | bcfg2-c11fcd8110e537db70bf40b91ed14467184b0e1c.tar.gz bcfg2-c11fcd8110e537db70bf40b91ed14467184b0e1c.tar.bz2 bcfg2-c11fcd8110e537db70bf40b91ed14467184b0e1c.zip | |
Merge branch 'fix-date-format' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/man/bcfg2.conf.txt | 5 | ||||
| -rw-r--r-- | doc/releases/1.4.0pre2.txt | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/doc/man/bcfg2.conf.txt b/doc/man/bcfg2.conf.txt index 62c4ac1a8..2f014812e 100644 --- a/doc/man/bcfg2.conf.txt +++ b/doc/man/bcfg2.conf.txt @@ -718,6 +718,11 @@ Reporting options Maximum number of children for the reporting collector. Use 0 to disable the limit. (default is 0) + django_settings + Arbitrary options for the Django installation. The value expected + is a literal python dictionary, that is merged with the already set + django settings. + See Also -------- diff --git a/doc/releases/1.4.0pre2.txt b/doc/releases/1.4.0pre2.txt index a5c10777a..195f81df0 100644 --- a/doc/releases/1.4.0pre2.txt +++ b/doc/releases/1.4.0pre2.txt @@ -31,6 +31,11 @@ backwards-incompatible user-facing changes This fixes potentially long client runs when comparing files that have diverged significantly. +* The database options in the config (options and reporting_options in database + section) now have to be literal python dictionaries. + + This allows to set arbitrary options with nested settings. + Thanks ------ |