summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * fixed vcs_root/vcs_path for Version plugins, esp. SvnChris St. Pierre2012-11-194-10/+12
| * Templating updates:Chris St. Pierre2012-11-197-90/+116
* | Merge remote branch 'upstream/master' into jasons-hackingJason Kincl2012-11-1969-632/+769
|\|
| * removed another print statementChris St. Pierre2012-11-161-1/+0
| * removed bogus lxml importChris St. Pierre2012-11-161-1/+0
| * removed bogus print statementsChris St. Pierre2012-11-163-8/+4
| * fixed tests for set_debugChris St. Pierre2012-11-162-14/+19
| * fixed plugin-specific implementations of toggle_debug for new set_debug stuffChris St. Pierre2012-11-163-14/+14
| * documented new core debug RMIsChris St. Pierre2012-11-161-1/+35
| * added set_debug RMI for plugins and core, set_fam_debug RMIChris St. Pierre2012-11-163-6/+24
| * Inotify: explicitly ignore events not in event maskChris St. Pierre2012-11-161-0/+7
| * Core: added toggle_debug RMI to toggle all debug modes on running serverChris St. Pierre2012-11-161-0/+6
| * FAM: allow toggling FAM debug by RMI on running serverChris St. Pierre2012-11-163-12/+10
| * cleaned up Templatehelper to help avoid some event handling errorsChris St. Pierre2012-11-163-80/+94
| * Git: Added ability to update to a specific tree-ishChris St. Pierre2012-11-162-13/+73
| * POSIX: fixed removal of symlinked directoriesChris St. Pierre2012-11-166-121/+120
| * Git: only support GitPython; only support Git.Update with GitPythonChris St. Pierre2012-11-162-126/+36
| * debian: Fix one more typoSol Jerome2012-11-151-1/+1
| * debian: Fix typoSol Jerome2012-11-151-1/+1
| * debian: Fix docs package (from Arto Jantunen)Sol Jerome2012-11-151-2/+2
| * debian: Apply init script fixes from Arto's repoSol Jerome2012-11-151-4/+4
| * debian: Add NEWS file from Arto's upstream repoSol Jerome2012-11-151-0/+16
| * debian: Sync some upstream changesSol Jerome2012-11-153-2/+2
| * Include debian upgrade tools in packagingArto Jantunen2012-11-151-0/+1
| * SSLCA: fixed variable namesChris St. Pierre2012-11-141-4/+4
| * set default umask for server, added option to change itChris St. Pierre2012-11-1415-22/+36