Merge branch 'release' into dev

2016-04-12 11:41:11 -07:00 · 2016-04-12 11:41:11 -07:00 · 946d895114
parent 84caf6968d f30f61f7bb
commit 946d895114
1 changed files with 1 additions and 1 deletions
--- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationTest.cs
@ -339,7 +339,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests
            Assert.Equal(expected1, response1.Trim());

            // Act - 2
-            await Task.Delay(TimeSpan.FromSeconds(1));
+            await Task.Delay(TimeSpan.FromSeconds(2));
            var response2 = await Client.GetStringAsync("/catalog/3");

            // Assert - 2