summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'feature/ldap-enhancements' of https://github.com/AlexanderS/bcfg2Sol Jerome2017-08-314-85/+191
|\
| * Server/Plugins/Ldap: Fix module nameAlexander Sulfrian2017-03-211-1/+2
| * Server/Plugins/Ldap: Support arbitrary ldap optionsAlexander Sulfrian2017-03-211-2/+7
| * Server/Plugins/Ldap: Support specifying the ldap uriAlexander Sulfrian2017-03-211-6/+12
| * Server/Plugins/Ldap: Cache the results of the Ldap queriesAlexander Sulfrian2017-03-211-17/+52
| * Server/Plugins/Ldap: Add missing argumentAlexander Sulfrian2017-03-211-1/+2
| * Server/Cache: Return the number of expired itemsAlexander Sulfrian2017-03-211-4/+13
| * Server/Plugins/Ldap: Use CallableDictAlexander Sulfrian2017-03-211-14/+28
| * Server/Plugin: CallableDict is an OnDemandDict without cachingAlexander Sulfrian2017-03-211-16/+46
| * Server/Plugin: Support functions and values for OnDemandDictAlexander Sulfrian2017-03-211-4/+9
| * Server/Plugin: Move OnDemandDict to helpersAlexander Sulfrian2017-03-212-50/+50
* | Merge branch 'feature/travis-container' of https://github.com/AlexanderS/bcfg2Sol Jerome2017-08-1814-42/+55
|\ \
| * | Bcfg2/manage.py: Fix pylint errorsAlexander Sulfrian2017-03-291-6/+14
| * | Utils: classproperty should use classmethodAlexander Sulfrian2017-03-291-1/+1
| * | Client: Restore python2.4 compatibilityAlexander Sulfrian2017-03-291-0/+1
| * | Fix errros with old pylint/pep8Alexander Sulfrian2017-03-2912-35/+39
* | | Merge branch 'import-models' of https://github.com/0/bcfg2 into add-missing-r...Sol Jerome2017-07-111-2/+2
|\ \ \
| * | | Reporting/Storage: Import ActionEntryDmitri Iouchtchenko2017-05-081-2/+2
* | | | Reporting: Add POSIX User/Group Entry typesSol Jerome2017-07-111-2/+4
|/ / /
* | | Merge pull request #388 from 0/import-serviceentryAlexander Sulfrian2017-05-081-2/+2
|\ \ \
| * | | Reporting/Storage: Import ServiceEntryDmitri Iouchtchenko2017-05-051-2/+2
| |/ /
* / / Probes: Remove wrong lineAlexander Sulfrian2017-03-221-1/+0
|/ /
* / Server/Info: Fix encoding declarationAlexander Sulfrian2017-03-211-1/+1
|/
* Server/Lint: Include RequiredBundle in referenced bundlesDmitri Iouchtchenko2017-03-171-0/+4
* Merge pull request #362 from AlexanderS/fix/missing-config-fileAlexander Sulfrian2017-03-101-1/+1
|\
| * Options: Missing config file is not a fatal errorAlexander Sulfrian2016-09-281-1/+1
* | Merge pull request #382 from AlexanderS/feature/multiline-debug-scriptsAlexander Sulfrian2017-03-101-3/+1
|\ \
| * | Fix multiline scripts in bcfg2-info debug modes19n2017-03-091-3/+1
* | | Reporting: Fix missing sys importSol Jerome2017-01-101-0/+1
|/ /
* | Merge pull request #345 from AlexanderS/fix/django-1.10Alexander Sulfrian2017-01-102-35/+35
|\ \
| * | Reporting/Compat: Add patterns compat methodAlexander Sulfrian2016-08-181-1/+13
| * | Reporting: Ensure we have an empty prefix in the url patternsAlexander Sulfrian2016-08-181-21/+22
| * | Reporting: Remove outdated commentsAlexander Sulfrian2016-08-181-13/+0
* | | Merge pull request #373 from AlexanderS/fix/django1.9/report-collectorAlexander Sulfrian2017-01-106-40/+42
|\ \ \
| * | | DBSettings: Call django.setup() right after configuring the settingsAlexander Sulfrian2016-11-285-28/+18
| * | | Reporting/Storage: Reordering of the importsAlexander Sulfrian2016-11-211-10/+9
| * | | Reporting/Storage: Removed unused importAlexander Sulfrian2016-11-211-1/+0
| * | | Reporting/Storage: Load django models after option parsingAlexander Sulfrian2016-11-211-4/+15
| * | | Reporting/Storage: Remove wildcard importAlexander Sulfrian2016-11-211-1/+4
* | | | Merge pull request #369 from AlexanderS/fix/lint/augeasAlexander Sulfrian2016-11-291-59/+107
|\ \ \ \
| * | | | Server/Lint: Replace dict with {}Alexander Sulfrian2016-11-291-59/+99
| * | | | Server/Lint: Fix code styleAlexander Sulfrian2016-11-211-4/+9
| * | | | Server/Lint: Add missing required attributesAlexander Sulfrian2016-11-211-1/+3
| * | | | Server/Lint: Add required attrs for augeas path entriesAlexander Sulfrian2016-11-211-0/+2
| * | | | Server/Lint: name attribute is required for all Path entriesAlexander Sulfrian2016-11-211-20/+19
* | | | | Merge pull request #372 from AlexanderS/fix/nagiosgenAlexander Sulfrian2016-11-291-5/+3
|\ \ \ \ \
| * | | | | Server/Plugins/NagiosGen: Remove the list conversionAlexander Sulfrian2016-11-231-5/+3
| * | | | | Server/Plugins/NagiosGen: Always include default groupAlexander Sulfrian2016-11-231-1/+1
| | |/ / / | |/| | |
* / | | | Client/Proxy.py: Provide more useful error messageSol Jerome2016-11-231-0/+3
|/ / / /
* / / / Client: Fix typo in commentAlexander Sulfrian2016-11-211-2/+2
|/ / /