Merge remote-tracking branch 'origin/6.1.4' into 7.0.0

Conflicts: src/Umbraco.Core/Umbraco.Core.csproj src/Umbraco.Tests/BusinessLogic/BaseTest.cs
2013-08-21 11:36:37 +10:00
parent 8cfb39ba2b e233cffb9d
commit b2eac9ab8f
23 changed files with 150 additions and 76 deletions
--- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
+++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
@@ -111,7 +111,7 @@ namespace Umbraco.Tests.TestHelpers
        /// </summary>
        protected virtual string GetDbConnectionString()
        {
-            return @"Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf";            
+            return @"Datasource=|DataDirectory|UmbracoPetaPocoTests.sdf;Flush Interval=1;File Access Retry Timeout=10";            
        }

        /// <summary>