summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Chris St. Pierre2013-11-128-17/+37
|\
| * bcfg2-crypt: Fixed variable name collisionChris St. Pierre2013-11-121-3/+3
| * bcfg2-crypt: backported fixes in b5b26415161e715fe4d22d69328b06801ff7124dChris St. Pierre2013-11-121-22/+25
| * Reports: Add missing ImportErrorSol Jerome2013-11-111-1/+1
| * Fix compatibility with Django 1.6.Simon Ruderich2013-11-119-16/+37
* | Options: made unit test flag publicChris St. Pierre2013-11-122-4/+4
* | Multiprocessing: Added missing Queue back in, merge failChris St. Pierre2013-11-121-1/+1
* | bcfg2-crypt: Avoid duplicate decrypt/encrypt when auto-determining modeChris St. Pierre2013-11-121-5/+7
* | bcfg2-crypt: Fixed several bugs in autodetection of encrypt/decrypt modeChris St. Pierre2013-11-121-41/+58
* | testsuite: Wrote bcfg2-crypt end-to-end testsChris St. Pierre2013-11-1213-0/+485
* | Options: added workaround for unit tests that use the parserChris St. Pierre2013-11-122-13/+15
* | Merge branch 'maint'Chris St. Pierre2013-11-1124-70/+150
|\|
| * bcfg2-crypt: fixed missing EVPErrorChris St. Pierre2013-11-111-2/+1
| * bcfg2-crypt: better debugging, error handling with Properties filesChris St. Pierre2013-11-111-3/+37
| * bcfg2-crypt: fixed completely backwards logicChris St. Pierre2013-11-111-1/+1
| * Probes: automatically remove duplicate probe dataChris St. Pierre2013-11-111-3/+10
| * doc: Add another level to our contents pageSol Jerome2013-11-081-1/+1
| * tools: skip ignored files (e.g., .svn) in migrate_perms_to_mode (from Matt Ba...Chris St. Pierre2013-11-081-1/+14
| * tools: fix incorrect reference to config file in migrate_configs.py (from Mat...Chris St. Pierre2013-11-081-4/+4
| * schemas: Add important attribute for BoundPathSol Jerome2013-11-071-0/+7
| * Version bump to 1.3.3v1.3.3Sol Jerome2013-11-0716-19/+31
| * bcfg2-selinux: Add pre/rc magicSol Jerome2013-11-071-0/+8
| * export: Add missing newlines for solaris manifestsSol Jerome2013-11-061-2/+2
| * export: Fix pre/rc behavior for spec filesSol Jerome2013-11-061-15/+32
| * export: Fix Release bugSol Jerome2013-11-061-0/+2
| * removed unused redhat specfile, export.shChris St. Pierre2013-11-068-552/+1
| * Multiprocessing: removed unused importChris St. Pierre2013-11-061-1/+1
| * bcfg2-crypt: fixed deprecation warningChris St. Pierre2013-11-051-1/+1
| * Multiprocessing: don't reuse child RPC listenersChris St. Pierre2013-11-051-26/+7
| * Merge pull request #110 from AlexanderS/reporting-model-updatesChris St. Pierre2013-11-051-5/+5
| |\
| | * bcfg2-reports: update to use current modelsAlexander Sulfrian2013-06-291-5/+5
| * | Merge pull request #143 from fennm/proxy-retry-on-ssl-errorChris St. Pierre2013-11-051-1/+0
| |\ \
| | * | Don't re-raise unknown exceptions per stpierreMichael Fenn2013-11-021-4/+0
| | * | Proxy: Catch SSL errors and retryMichael Fenn2013-11-011-0/+3
| * | | Merge pull request #144 from fennm/admin-avoid-NotImplementedErrorChris St. Pierre2013-11-052-2/+0
| |\ \ \ | | |/ / | |/| |
| | * | Admin: Don't call dead Mode.__call__ codeMichael Fenn2013-11-052-2/+0
| |/ /
* | | doc: Added docs for TemplateHelper __default__ featureChris St. Pierre2013-11-111-2/+14
* | | bcfg2-lint: better checks for TemplateHelper __default__ stuffChris St. Pierre2013-11-111-1/+15
* | | TemplateHelper: misc. cleanup of __default__ featureChris St. Pierre2013-11-111-14/+20
* | | Merge branch 'maint'Sol Jerome2013-11-044-74/+0
|\| |
| * | misc/bcfg2.spec: Remove more unnecessary requiresSol Jerome2013-10-301-2/+0
| * | misc/bcfg2.spec: Remove some unnecessary requiresSol Jerome2013-10-301-4/+0
| * | doc: Remove deprecated ssl documentationSol Jerome2013-10-303-68/+0
| * | doc: Remove reference to bcfg2-admin querySol Jerome2013-10-301-1/+0
* | | Reporting: fixed error reportingChris St. Pierre2013-10-311-1/+1
* | | bcfg2-report-collector: import DBSettings explicitly to parse them earlyChris St. Pierre2013-10-311-0/+1
* | | Options: Don't reparse initial config fileChris St. Pierre2013-10-311-3/+5
* | | Info: Make ^C interaction look nicerSol Jerome2013-10-301-1/+1
* | | bcfg2-reports: rewrote with new option parserChris St. Pierre2013-10-303-278/+280
* | | Core: Avoid unnecessarily reparsing config file on startupChris St. Pierre2013-10-301-1/+4