summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bcfg2/Server/Admin: fix the Help subcommandAlexander Sulfrian2014-11-251-1/+3
* Merge branch 'fix-version' of https://github.com/AlexanderS/bcfg2Sol Jerome2014-11-252-2/+16
|\
| * Bcfg2/Options/Parser: fix --version option, add testAlexander Sulfrian2014-11-252-2/+16
* | Merge pull request #243 from AlexanderS/fix-missing-bundleChris St. Pierre2014-11-201-1/+2
|\ \ | |/ |/|
| * Server/Core: fix missing bundle errorAlexander Sulfrian2014-11-211-1/+2
|/
* Merge branch 'include2' of https://github.com/gordonmessmer/bcfg2Sol Jerome2014-11-174-13/+192
|\
| * Add examples for the "include" and "extends" tags in Jinja2.Gordon Messmer2014-11-172-0/+115
| * Add loader/environment to Jinja2 templates so that files canGordon Messmer2014-11-062-13/+77
* | Client/Tools/APT: some syntax cleanupAlexander Sulfrian2014-11-161-15/+13
* | Client/Tools/APT: use more modern python-apt APIAlexander Sulfrian2014-11-161-9/+2
* | Client/Tools/APT: use "pkg in cache" everywhereAlexander Sulfrian2014-11-161-3/+3
* | Revert "APT: add backwards compatibility for python-apt 0.6"Alexander Sulfrian2014-11-161-9/+2
* | Client/Tools/APT: remove all the stuff for the old APIAlexander Sulfrian2014-11-163-56/+19
* | Merge branch 'maint'Alexander Sulfrian2014-11-1239-214/+463
|\ \
| * \ 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
| | |/ / /
| * | | | Merge branch 'ssl-protocol-fix' of github.com:solj/bcfg2 into maintSol Jerome2014-10-213-5/+10
| |\ \ \ \
| | * | | | Proxy.py: Pass through SSL protocol optionSol Jerome2014-10-153-5/+10
| | |/ / /
| * | | | Merge pull request #215 from jsbillings/yum-pluginChris St. Pierre2014-10-202-0/+22
| |\ \ \ \ | | |/ / / | |/| | |