summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* FileMonitor/Pseudo: Only produce exists events, if file exists.Alexander Sulfrian2015-02-171-1/+2
* Server/Plugins/Decisions: Monitor files for changes.Alexander Sulfrian2015-02-171-2/+4
* Remove unnecessary suppression of apt warningsChris St. Pierre2015-02-171-5/+0
* more pylint fixesChris St. Pierre2015-02-172-8/+12
* one more pylint fixChris St. Pierre2015-02-171-2/+2
* Pylint fixes for pylint 0.28Chris St. Pierre2015-02-1714-60/+68
* DBSettings: Fix time_zone option.Alexander Sulfrian2015-01-282-3/+3
* doc: Fix typoSol Jerome2015-01-031-1/+1
* Merge branch 'bundle-modification-deps' of https://github.com/AlexanderS/bcfg2Sol Jerome2015-01-037-28/+187
|\
| * Bundler: modification is now the boolean inherit_modificationAlexander Sulfrian2014-11-254-17/+12
| * testsuite: add test for modification inheritanceAlexander Sulfrian2014-11-251-0/+36
| * Bundler: add modification support to Bundle dependenciesAlexander Sulfrian2014-11-257-28/+156
* | doc: Fix title over/underlinesSol Jerome2015-01-022-4/+6
* | testsuite/common.py: Default to using unittest2Sol Jerome2014-12-191-2/+2
* | Server/Plugin/helpers: remove track_statisticsAlexander Sulfrian2014-12-134-47/+11
* | Merge branch 'fix-client-keyboard-interrupt' of https://github.com/AlexanderS...Sol Jerome2014-12-092-0/+12
|\ \
| * | Bcfg2/Client: do not catch KeyboardInterruptAlexander Sulfrian2014-11-252-0/+12
| |/
* | Server/Plugins/Metadata: add remove_client to rmi methodsAlexander Sulfrian2014-12-081-1/+2
* | Server/SSLServer: allow None as return valueAlexander Sulfrian2014-12-081-1/+1
* | Server/Plugins/Metadata: add list_clients to rmi methodsAlexander Sulfrian2014-11-301-0/+1
* | Server/SSLServer: allow set as return valueAlexander Sulfrian2014-11-301-1/+3
* | NagiosGen: Fix typo in b1b6b5aeSol Jerome2014-11-261-1/+0
* | NagiosGen: Add bundles to configurationSol Jerome2014-11-262-1/+10
* | 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