lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch '1.8.x' into 1.x

Browse Source 
Conflicts:
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Orchard.Azure.MediaServices.csproj
	src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs
This commit is contained in:
Sebastien Ros
2014-08-13 11:24:02 -07:00
parent 5787aff608 64eb4725bc
commit 841c7d6d44
18 changed files with 211 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Azure/Orchard.Azure.Web/Config/log4net.config
View File

@@ -13,7 +13,7 @@
<levelMin value="WARN" />
</filter>
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date [%thread] %logger - %message%newline" />
<conversionPattern value="%date [%thread] %logger - %P{Tenant} - %message%newline %P{Url}%newline" />
</layout>
</appender>