summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch 'master' of https://github.com/kincl/bcfg2Sol Jerome2015-10-011-0/+1
|\ \ \ \ \
| * | | | | Run the superclass shutdown() to correctly set self.startedJason Kincl2015-09-291-0/+1
* | | | | | Bundler: Fix addition of bundle.Alexander Sulfrian2015-09-301-1/+1
|/ / / / /
* | | | | Merge branch 'core-py' of https://github.com/gordonmessmer/bcfg2Sol Jerome2015-09-241-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Prevent lxml Element from being passed non-string dataGordon Messmer2015-09-131-1/+1
| | |_|/ | |/| |
* / | | Logging: Fix message buildingAlexander Sulfrian2015-09-211-0/+2
|/ / /
* | | 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-013-2/+51
|\ \ \ \
| * | | | Rules: New options replace_name to replace %{name} in attributesAlexander Sulfrian2015-08-263-2/+51
* | | | | 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-281-0/+3
|\ \ \ \ \
| * | | | | Options: Set default values from config, right after adding a new optionAlexander Sulfrian2015-07-221-0/+3
| |/ / / /
* | | | | 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: Complete renew of the Ldap pluginAlexander Sulfrian2015-07-241-165/+159
* | | | | Utils: Generalize safe_module_nameAlexander Sulfrian2015-07-243-13/+17
|/ / / /
* | | | Merge branch 'fix-date-format' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-07-238-31/+27
|\ \ \ \
| * | | | DBSettings: Add possibility to specify arbitrary django options.Alexander Sulfrian2015-07-231-1/+8
| * | | | Reporting/templates: Use configurable date formats.Alexander Sulfrian2015-07-236-6/+12
| * | | | Options/Types: Fix database OPTIONS parsingAlexander Sulfrian2015-07-232-24/+7
| | |/ / | |/| |
* | | | Merge branch 'merge-files-ignore-binary' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-07-223-17/+22
|\ \ \ \ | |/ / / |/| | |
| * | | Utils: Generalize is_string from POSIX/FileAlexander Sulfrian2015-07-223-24/+22
| * | | Lint/MergeFiles: Ignore binary filesAlexander Sulfrian2015-07-211-0/+7
| |/ /
* / / PrioDir: Only set text content, if something is availableAlexander Sulfrian2015-07-211-1/+2
|/ /
* | Merge branch 'maint'Alexander Sulfrian2015-06-1216-89/+307
|\ \
| * | Version bump to 1.3.6Sol Jerome2015-06-112-2/+2
| * | Reporting: Fix plus/minusSol Jerome2015-06-111-2/+2
| * | 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
| * | | compat: use eval instead of ast.literal_eval on python 2.4Michael Fenn2015-03-192-2/+8
| * | | APT.py: Fix syntax error introduced in cae39b7Sol Jerome2015-03-191-1/+1
| * | | Reporting/models.py: Fix typoSol Jerome2015-03-171-1/+1
| * | | Server/Core: drop privileges even if not running as daemonAlexander Sulfrian2015-02-255-8/+34
| * | | Merge pull request #267 from stpierre/pylint-0.28-maintChris St. Pierre2015-02-2513-82/+83
| |\ \ \
| | * | | Fix pylint errorsChris St. Pierre2015-02-2513-82/+83
| * | | | Merge pull request #254 from AlexanderS/fix-yum-initChris St. Pierre2015-02-252-48/+92
| |\ \ \ \
| | * | | | Plugins/Packages/Source: Remove unused arguments of _init_attributesAlexander Sulfrian2015-01-232-9/+4