summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Compatibility with Jinja < 2.7.Gordon Messmer2015-09-091-3/+9
* Keep trailing newlines in Jinja2 templates.Gordon Messmer2015-09-091-1/+3
* Merge branch 'no-django' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-09-011-2/+4
|\
| * DBSettings: Don't use django, if it's not availableAlexander Sulfrian2015-07-201-2/+4
* | Merge branch 'rules-replace_name' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-09-019-11/+116
|\ \
| * | testsuite: Fix debug messages to handle xml with a '%' insideAlexander Sulfrian2015-08-261-9/+10
| * | Rules: New options replace_name to replace %{name} in attributesAlexander Sulfrian2015-08-268-2/+106
* | | Merge pull request #304 from s19n/masterChris St. Pierre2015-09-011-3/+1
|\ \ \
| * | | doc: update Genshi 'name' attribute descriptions19n2015-08-071-3/+1
|/ / /
* | | Merge branch 'no-jinja2' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-07-281-14/+15
|\ \ \
| * | | Plugins/Cfg: Don't depend on jinja2Alexander Sulfrian2015-07-201-14/+15
| | |/ | |/|
* | | Merge pull request #292 from AlexanderS/fix-options-defaultChris St. Pierre2015-07-283-2/+14
|\ \ \
| * | | Options: Add test to use config value for options from loaded componentsAlexander Sulfrian2015-07-222-2/+11
| * | | Options: Set default values from config, right after adding a new optionAlexander Sulfrian2015-07-221-0/+3
* | | | Merge pull request #302 from AlexanderS/fix/logging-with-daemonChris St. Pierre2015-07-281-1/+20
|\ \ \ \
| * | | | BuiltinCore: Fix logging with daemonizationAlexander Sulfrian2015-07-281-1/+20
|/ / / /
* | | | Merge branch 'fix/systemd-ignore' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-07-281-1/+1
|\ \ \ \
| * | | | Client/Tools/Systemd: Do not stop services if status is set to ignoreAlexander Sulfrian2015-07-271-1/+1
* | | | | Ldap: Run full code style checks agains the pluginAlexander Sulfrian2015-07-241-1/+0
* | | | | Ldap: Complete renew of the Ldap pluginAlexander Sulfrian2015-07-245-255/+267
* | | | | Utils: Generalize safe_module_nameAlexander Sulfrian2015-07-244-23/+33
|/ / / /
* | | | Merge branch 'fix-date-format' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-07-2313-40/+54
|\ \ \ \
| * | | | testsuite/common: Add the new option.Alexander Sulfrian2015-07-231-0/+1
| * | | | DBSettings: Add possibility to specify arbitrary django options.Alexander Sulfrian2015-07-233-1/+18
| * | | | Reporting/templates: Use configurable date formats.Alexander Sulfrian2015-07-236-6/+12
| * | | | Options/Types: Fix database OPTIONS parsingAlexander Sulfrian2015-07-234-33/+23
| | |_|/ | |/| |
* | | | Merge branch 'merge-files-ignore-binary' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-07-225-39/+43
|\ \ \ \ | |/ / / |/| | |
| * | | tests: is_string is now in Bcfg2.UtilsAlexander Sulfrian2015-07-222-22/+21
| * | | Utils: Generalize is_string from POSIX/FileAlexander Sulfrian2015-07-223-24/+22
| * | | Lint/MergeFiles: Ignore binary filesAlexander Sulfrian2015-07-211-0/+7
| |/ /
* | | Merge branch 'fix-defaults' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-07-211-1/+2
|\ \ \ | |/ / |/| |
| * | PrioDir: Only set text content, if something is availableAlexander Sulfrian2015-07-211-1/+2
| |/
* | Merge pull request #288 from AlexanderS/fix-toolsChris St. Pierre2015-07-212-7/+11
|\ \ | |/ |/|
| * tools: components of a Options parser sould be a listAlexander Sulfrian2015-07-201-1/+1
| * tools: Fix issue introduced in cd14868d with new parser for OptionsAlexander Sulfrian2015-07-202-6/+10
|/
* Merge branch 'maint'Alexander Sulfrian2015-06-1226-99/+358
|\
| * Version bump to 1.3.6Sol Jerome2015-06-1116-16/+22
| * doc: Add more 1.3.6 release notesSol Jerome2015-06-111-1/+8
| * Reporting: Fix plus/minusSol Jerome2015-06-111-2/+2
| * docs: TemplateHelper forgot how to sentenceChris St. Pierre2015-05-081-3/+3
| * Merge branch 'fix-yum-packages-traceback' into maintSol Jerome2015-04-281-4/+9
| |\
| | * Yum.py: Add debug log messageSol Jerome2015-04-281-0/+2
| | * Yum.py: Fix traceback when arch missingSol Jerome2014-11-041-4/+7
| * | Merge pull request #276 from gaurdro/fix-secontext-not-supportedChris St. Pierre2015-04-212-20/+37
| |\ \
| | * | handle filesystem secontexts properly for contextless filesystemsRoss Smith2015-04-162-20/+37
| * | | Reporting: Fix typoSol Jerome2015-04-171-1/+1
| |/ /
| * | FreeBSDInit: Fix __init__ callSol Jerome2015-04-091-1/+1
| * | Yum.py: Compare epoch/version/release separatelySol Jerome2015-03-311-6/+15
| * | Packages/Yum.py: Fix dependency resolution logicSol Jerome2015-03-301-2/+101
| * | Server/Plugins/Packages: Fix _init_attributes position.Alexander Sulfrian2015-03-251-2/+2