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

Merge remote-tracking branch 'origin/6.2.5' into 7.2.1

Browse Source 
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/install/steps/defaultUser.ascx
	src/Umbraco.Web.UI/web.Template.Debug.config
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
	src/Umbraco.Web/Scheduling/IBackgroundTask.cs
	src/Umbraco.Web/Scheduling/KeepAlive.cs
	src/Umbraco.Web/Scheduling/LogScrubber.cs
	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
	src/Umbraco.Web/Scheduling/ScheduledTasks.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/Scheduling/TaskEventArgs.cs
	src/Umbraco.Web/Umbraco.Web.csproj
This commit is contained in:
Shannon
2014-12-08 17:16:16 +11:00
parent 3b2a27dfb2 864994a56e
commit 0a7bbfb1ca
12 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
View File

@@ -230,7 +230,7 @@ namespace Umbraco.Tests.Scheduling
//wait till the thread is done
await tManager;
foreach (var task in tasks)
{
Assert.IsTrue(task.Ended != default(DateTime));
@@ -241,6 +241,7 @@ namespace Umbraco.Tests.Scheduling
Assert.IsFalse(tManager.IsDisposed);
}
}
private class MyTask : BaseTask
{