summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | some more django 1.7 compatibility fixesJonas Jochmaring2015-09-233-14/+19
| * | | make Bcfg2-web compatible with django 1.7Jonas Jochmaring2015-09-2313-492/+1061
* | | | Merge branch 'add-schemamigration' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-10-011-1/+13
|\ \ \ \
| * | | | bcfg2-admin: Add command to generate migrationsAlexander Sulfrian2015-09-211-1/+13
* | | | | 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
* | | | | | testsuite: metadata.bundles shoud be a set()Alexander Sulfrian2015-09-301-2/+2
* | | | | | Bundler: Fix addition of bundle.Alexander Sulfrian2015-09-301-1/+1
|/ / / / /
* | | | | Merge branch 'master' of https://github.com/gordonmessmer/bcfg2Sol Jerome2015-09-241-3/+10
|\ \ \ \ \
| * | | | | The export script will set _rc to "rc<number", and likewise forGordon Messmer2015-09-141-3/+3
| * | | | | Include recent changes in RPM spec dependencies.Gordon Messmer2015-09-131-2/+9
* | | | | | 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
| |/ / / /
* | | | | Merge pull request #310 from AlexanderS/fix/loggingChris St. Pierre2015-09-211-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Logging: Fix message buildingAlexander Sulfrian2015-09-211-0/+2
|/ / / /
* | | | Merge pull request #306 from gordonmessmer/masterChris St. Pierre2015-09-111-1/+9
|\| | |
| * | | 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