yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-v7' into 7.3.0

Browse Source 
Conflicts:
	src/Umbraco.Core/ApplicationContext.cs
	src/Umbraco.Core/Logging/LogHelper.cs
	src/Umbraco.Web.UI.Client/src/less/login.less
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
This commit is contained in:
Stephan
2015-05-18 16:23:12 +02:00
parent 25f9fecc16 3b791c75f6
commit 031f70f529
8 changed files with 155 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
View File

@@ -535,7 +535,7 @@ namespace Umbraco.Web.Scheduling
// processing, call the UnregisterObject method, and then return or it can return immediately and complete
// processing asynchronously before calling the UnregisterObject method.
_logger.Debug<BackgroundTaskRunner<T>>("Shutting down, waiting for tasks to complete.");
_logger.Info<BackgroundTaskRunner<T>>("Shutting down, waiting for tasks to complete.");
Shutdown(false, false); // do not accept any more tasks, flush the queue, do not wait
lock (_locker)