summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'options-unit-tests' of https://github.com/stpierre/bcfg2Alexander Sulfrian2014-11-1030-273/+1829
|\
| * Options: Fixed non-path database name parsingChris St. Pierre2014-11-103-27/+54
| * Options: further command registry fixesChris St. Pierre2014-11-102-4/+7
| * Options: gather as much data from config file firstChris St. Pierre2014-11-101-2/+10
| * Options: fix path canonicalization and file-like objectsChris St. Pierre2014-10-222-8/+17
| * testsuite: unlink temporary filesChris St. Pierre2014-10-222-5/+10
| * Options: ensure <repository> macros are always fixed upChris St. Pierre2014-10-225-46/+130
| * DBSettings: fix up <repository> in database nameChris St. Pierre2014-10-221-1/+1
| * testsuite: better debug capturing for options testsChris St. Pierre2014-10-223-25/+33
| * call shutdown on subcommand registriesChris St. Pierre2014-10-222-6/+11
| * fixed some places where plugin loading should fail silentlyChris St. Pierre2014-10-223-8/+19
| * testsuite: Added unit tests for new option parsingChris St. Pierre2014-10-221-0/+1
| * testsuite: capture stderr by defaultChris St. Pierre2014-10-222-0/+15
| * Test failure to parse config file when bcfg2.conf existsChris St. Pierre2014-10-222-7/+3
| * testsuite: skip nested exclusive option group test on py2.6Chris St. Pierre2014-10-222-5/+15
| * testsuite: Added unit tests for new option parsingChris St. Pierre2014-10-2226-219/+1593
* | Merge remote branch 'upstream/maint'Alexander Sulfrian2014-11-1039-213/+461
|\ \
| * \ Merge branch 'fix-django-db-options-parsing' into maintSol Jerome2014-11-105-42/+32
| |\ \
| | * | Options.py: Fix database OPTIONS parsingSol Jerome2014-11-045-42/+32
| * | | Client/Tools/APT: fix pylint errors, enable checkAlexander Sulfrian2014-11-102-63/+83
| * | | Client/Tools/APT: fix exception nameAlexander Sulfrian2014-11-101-1/+1
| * | | Merge branch 'SYSV-use-simplefile' of https://github.com/fennm/bcfg2 into maintSol Jerome2014-11-084-10/+72
| |\ \ \
| | * | | SYSV: add a migration tool to change simplename attributes to simplefileMichael Fenn2014-11-072-0/+55
| | * | | doc: Update SYSV datastream format docsMichael Fenn2014-11-061-3/+11
| | * | | SYSV: change instances of simplename to simplefileMichael Fenn2014-11-062-8/+7
| | |/ /
| * | | Merge branch 'handle-apt-update-exceptions' of https://github.com/AlexanderS/...Sol Jerome2014-11-061-1/+5
| |\ \ \
| | * | | Client/Tools/APT: handle exceptions gracefullyAlexander Sulfrian2014-11-051-1/+5
| | |/ /
| * | | Server/Plugins/Packages: add debsrc attribute to url_mapAlexander Sulfrian2014-11-051-2/+2
| * | | schemas/packages.xsd: add default value for debsrcAlexander Sulfrian2014-11-051-1/+1
| |/ /
| * | doc: Fix typosSol Jerome2014-11-031-8/+8
| * | doc: Add note about Decisions fix for 1.3.6Sol Jerome2014-10-311-0/+1
| * | testsuite: Fix tools __init__.py unit testAlexander Sulfrian2014-10-301-0/+2
| * | Tools: Fix install of non-whitelisted servicesSol Jerome2014-10-292-21/+23
| * | doc: Add 1.3.6 release notesSol Jerome2014-10-281-0/+26
| * | Merge pull request #223 from AlexanderS/fix-keyboard-interruptChris St. Pierre2014-10-272-1/+3
| |\ \
| | * | fix keyboard interrupt during intial event handlingAlexander Sulfrian2014-10-262-1/+3
| |/ /
| * | Merge pull request #222 from AlexanderS/fix-keyboard-interruptChris St. Pierre2014-10-241-5/+5
| |\ \
| | * | Server/Core: also shutdown on exceptions during fam blockingAlexander Sulfrian2014-10-251-5/+5
| |/ /
| * | Merge branch 'cleanup_pidfile' of https://github.com/mattikus/bcfg2 into maintSol Jerome2014-10-232-23/+41
| |\ \
| | * | Remove PIDFileError as it does not always exist in the package and is rarely ...Matt Kemp2014-10-021-5/+0
| | * | Catch possible typeerror resulting from None being returned when reading the ...Matt Kemp2014-10-022-2/+2
| | * | Fixes to ensure pidfile can be opened or broken if stale.Matt Kemp2014-10-012-19/+15
| | * | pylint fixes.Matt Kemp2014-10-011-3/+4
| | * | Attempt to break the pid lock during startup.Matt Kemp2014-10-012-15/+41
| * | | Merge branch 'reporting-fix-filter' of https://github.com/AlexanderS/bcfg2 in...Sol Jerome2014-10-232-39/+50
| |\ \ \
| | * | | Reporting: better exception handlingAlexander Sulfrian2014-10-201-33/+44
| | * | | Reporting: fix filter urlsAlexander Sulfrian2014-10-121-6/+6
| * | | | Merge branch 'add-name-for-sources' of https://github.com/AlexanderS/bcfg2 in...Sol Jerome2014-10-212-2/+19
| |\ \ \ \
| | * | | | Packages: add name to additional_data for SourcesAlexander Sulfrian2014-10-181-0/+1
| | * | | | Packages: add name to sourcesAlexander Sulfrian2014-10-182-2/+18
| | |/ / /