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

Merge remote-tracking branch 'origin/6.2.1' into 7.1.5

Browse Source 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config
This commit is contained in:
Shannon
2014-06-25 14:33:32 +10:00
parent 38c4bc72cd a4bf4b0977
commit 3ecc974325
18 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web/WebBootManager.cs
View File

@@ -298,7 +298,6 @@ namespace Umbraco.Web
DefaultRenderMvcControllerResolver.Current = new DefaultRenderMvcControllerResolver(typeof(RenderMvcController));
//Override the ServerMessengerResolver to set a username/password for the distributed calls
//ServerMessengerResolver.Current.SetServerMessenger(new DefaultServerMessenger(() =>
ServerMessengerResolver.Current.SetServerMessenger(new BatchedServerMessenger(() =>
{
//we should not proceed to change this if the app/database is not configured since there will