summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #345 from AlexanderS/fix/django-1.10Alexander Sulfrian2017-01-103-36/+36
|\ \
| * | testsuite: Bump django versionAlexander Sulfrian2016-08-181-1/+1
| * | 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-292-9/+4
|\ \ \ \ \
| * | | | | Server/Plugins/NagiosGen: Remove the list conversionAlexander Sulfrian2016-11-231-5/+3
| * | | | | Server/Plugins/NagiosGen: Always include default groupAlexander Sulfrian2016-11-231-1/+1
| * | | | | doc: Remove outdated NagiosGen informationAlexander Sulfrian2016-11-231-4/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'provide-more-useful-missingca-message' of github.com:solj/bcfg2Sol Jerome2016-11-291-0/+3
|\ \ \ \ \
| * | | | | Client/Proxy.py: Provide more useful error messageSol Jerome2016-11-231-0/+3
| |/ / / /
* / / / / doc: Fix typoAlexander Sulfrian2016-11-241-1/+1
|/ / / /
* / / / Client: Fix typo in commentAlexander Sulfrian2016-11-211-2/+2
|/ / /
* | | Merge pull request #368 from solj/fix-ssl-futurewarningAlexander Sulfrian2016-11-211-2/+2
|\ \ \
| * | | Cfg: Fix SSLCA key generationSol Jerome2016-11-181-2/+2
* | | | Merge pull request #366 from 0/augeas-lxmlAlexander Sulfrian2016-11-211-14/+15
|\ \ \ \
| * | | | Client/Tools/POSIX: Avoid lxml features in AugeasDmitri Iouchtchenko2016-11-041-14/+15
| |/ / /
* | | | Merge pull request #367 from AlexanderS/fix/removed-packagesAlexander Sulfrian2016-11-213-1/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Packages: Cleanup pkgnamesAlexander Sulfrian2016-11-173-1/+4
|/ / /
* | | Merge pull request #363 from solj/fix-admin-typoAlexander Sulfrian2016-09-281-1/+1
|\ \ \
| * | | Admin: Remove extraneous quoteSol Jerome2016-09-281-1/+1
* | | | Options: Fix default repository pathSol Jerome2016-09-281-1/+1
|/ / /
* | | Merge branch 'ed25519-doc' of https://github.com/0/bcfg2Sol Jerome2016-09-162-17/+21
|\ \ \
| * | | doc: Mention support for Ed25519 in SSHbaseDmitri Iouchtchenko2016-08-312-17/+21
* | | | Merge branch 'select_related' of https://github.com/0/bcfg2Sol Jerome2016-09-161-1/+1
|\ \ \ \
| * | | | Reporting: Remove invalid fields from select_relatedDmitri Iouchtchenko2016-09-151-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'pacman' of https://github.com/0/bcfg2Sol Jerome2016-09-154-60/+188
|\ \ \ \ | |/ / / |/| | |
| * | | Client/Tools/Pacman: Decrease logging levelsDmitri Iouchtchenko2016-09-121-5/+4
| * | | Packages/Pac: Handle groupsDmitri Iouchtchenko2016-09-123-42/+94
| * | | Packages/Pac: Parse dependenciesDmitri Iouchtchenko2016-09-121-13/+90
* | | | Merge branch 'fix/testsuite/db-tests' of https://github.com/AlexanderS/bcfg2Sol Jerome2016-09-125-53/+42
|\ \ \ \
| * | | | testsuite: Use TestDatabaseBacked for Probes, tooAlexander Sulfrian2016-09-121-3/+3
| * | | | Revert "Revert "removed duplicate plugins option""Alexander Sulfrian2016-09-121-29/+5
| * | | | testsuite: Increase verbosity of management commandsAlexander Sulfrian2016-09-121-2/+2
| * | | | testsuite: Unlink database before syncingAlexander Sulfrian2016-09-121-9/+20
| * | | | testsuite: Only sync the database once per TestCaseAlexander Sulfrian2016-09-054-11/+13
| |/ / /
* | | | Merge branch 'django-check' of https://github.com/0/bcfg2Sol Jerome2016-09-121-1/+1
|\ \ \ \
| * | | | bcfg2-admin: Check for django before checking django versionDmitri Iouchtchenko2016-09-111-1/+1
| |/ / /