summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master' into jasons-hackingJason Kincl2012-12-0435-504/+1647
|\
| * fixed conversion to octal in py3kChris St. Pierre2012-12-045-10/+34
| * doc: Fix indentation errorsSol Jerome2012-12-031-5/+5
| * doc: Fix broken linkSol Jerome2012-12-031-2/+2
| * fixed SELinux tool/plugin testsChris St. Pierre2012-12-032-17/+16
| * fixed test that was "broken" when assertXMLEqual was fixedChris St. Pierre2012-12-031-4/+4
| * SSLCA improvements:Chris St. Pierre2012-12-034-263/+319
| * Merge branch 'master' of github.com:Bcfg2/bcfg2Tim Laszlo2012-12-0320-195/+1216
| |\
| | * testsuite: fixed assertXMLEqual comparison of XML attribute valuesChris St. Pierre2012-12-032-6/+7
| | * added builtin support for creating users and groupsChris St. Pierre2012-12-0313-47/+1099
| | * doc: fixed in-depth genshi debugging instructionsChris St. Pierre2012-12-031-15/+15
| | * POSIX: Fixed handling of empty files that don't exist on client in interactiv...Chris St. Pierre2012-12-031-0/+4
| | * SELinux: Split up selinux entriesSol Jerome2012-12-034-127/+91
| | * doc: Fix broken target nameSol Jerome2012-11-291-2/+2
| * | Reporting: fix missing clients in grid viewTim Laszlo2012-12-031-1/+1
| |/
| * Move group filter for detailed list. fixes css sizingTim Laszlo2012-11-291-1/+1
| * Cfg: Fixed bugs in Genshi error handling:Chris St. Pierre2012-11-291-11/+54
| * prettier stringification for Bcfg2VersionInfo objectsChris St. Pierre2012-11-291-2/+2
* | Added documentationJason Kincl2012-12-031-1/+9
* | Future-proofed conflict option selectionJason Kincl2012-12-031-13/+9
* | fixing logic so try..except works correctly, bugsJason Kincl2012-11-282-9/+4
* | adding doc, changing variable namesJason Kincl2012-11-272-3/+30
* | fixing syntaxJason Kincl2012-11-271-1/+1
* | log actions betterJason Kincl2012-11-271-0/+3
* | fixing line lengthsJason Kincl2012-11-271-1/+2
* | fixing bugsJason Kincl2012-11-271-5/+6
* | adding svn_resolution to global namespaceJason Kincl2012-11-271-2/+2
* | adding svn merge resolution mapJason Kincl2012-11-271-3/+27
* | Merge remote branch 'upstream/master' into jasons-hackingJason Kincl2012-11-2731-257/+480
|\|
| * catch pulp errors when creating/binding consumersChris St. Pierre2012-11-271-10/+25
| * made Reporting plugin and transports debuggable, respond to set_debug/toggle_...Chris St. Pierre2012-11-274-24/+46
| * Threaded plugin fixes:Chris St. Pierre2012-11-275-11/+55
| * gave ProbeSet a pretty stringification for debug outputChris St. Pierre2012-11-271-0/+3
| * produce debug logs about how logging is configuredChris St. Pierre2012-11-271-4/+9
| * fixed bcfg2-info buildbundle to use code from Bundler pluginChris St. Pierre2012-11-271-27/+17
| * disambiguate yum transaction errorsChris St. Pierre2012-11-271-4/+4
| * doc: Add links to source codeSol Jerome2012-11-271-0/+1
| * fixed core syncdb in non-daemon contexts (e.g., bcfg2-info)Chris St. Pierre2012-11-261-6/+7
| * updated IncludeHelper TemplateHelper exampleChris St. Pierre2012-11-261-46/+62
| * removed unnecessary cron path changes from redhat-specific specfileChris St. Pierre2012-11-261-3/+0
| * create data directory for reporting TransportsChris St. Pierre2012-11-261-2/+14
| * validate storage backend with DirectStore reporting TransportChris St. Pierre2012-11-261-0/+3
| * when a new sqlite database is created for reporting, set appropriate permissionsChris St. Pierre2012-11-261-7/+28
| * doc: Document metadata caching optionsSol Jerome2012-11-263-2/+56
| * avoid odd edge case in genshi error handlingChris St. Pierre2012-11-261-3/+7
| * documented "recursive" attr of permissions Path entriesChris St. Pierre2012-11-211-12/+14
| * SSLCA: read SSLCA config without instantiating a new ConfigParserChris St. Pierre2012-11-201-3/+2
| * BuiltinCore: fixed import of LockFailedChris St. Pierre2012-11-191-2/+3
| * fail gracefully when pidfile creation failsChris St. Pierre2012-11-191-5/+10
| * create pidfile directory with correct permsChris St. Pierre2012-11-191-1/+1