Merge branch '6.x' of github.com:elastic/elasticsearch-net into 6.x

russcam · russcam · commit 8ce0a3289fb8 · 2018-06-22T14:46:48.000+10:00
diff --git a/src/Tests/ClientConcepts/Connection/HttpConnectionTests.cs b/src/Tests/ClientConcepts/Connection/HttpConnectionTests.cs
@@ -98,7 +98,7 @@ private static RequestData CreateRequestData(
 			bool disableAutomaticProxyDetection = false,
 			bool httpCompression = false)
 		{
-			if (requestTimeout == default(TimeSpan)) requestTimeout = TimeSpan.FromSeconds(1);
+			if (requestTimeout == default(TimeSpan)) requestTimeout = TimeSpan.FromSeconds(10);
 
 			var connectionSettings = new ConnectionSettings(new Uri("http://localhost:9200"))
 				.RequestTimeout(requestTimeout)

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ private static RequestData CreateRequestData(`
`98`	`98`	`bool disableAutomaticProxyDetection = false,`
`99`	`99`	`bool httpCompression = false)`
`100`	`100`	`{`
`101`		`- if (requestTimeout == default(TimeSpan)) requestTimeout = TimeSpan.FromSeconds(1);`
	`101`	`+ if (requestTimeout == default(TimeSpan)) requestTimeout = TimeSpan.FromSeconds(10);`
`102`	`102`
`103`	`103`	`var connectionSettings = new ConnectionSettings(new Uri("http://localhost:9200"))`
`104`	`104`	`.RequestTimeout(requestTimeout)`