Merge branch 'develop' of github.com:elasticsearch/elasticsearch-net into develop

Author: Mpdreamz

src/Nest/Resolvers/Converters/Aggregations/AggregationConverter.cs

@@ -242,7 +242,19 @@ private IAggregation GetExtendedStatsAggregation(StatsMetric statsMetric, JsonRe
 				reader.Read();
 				reader.Read();
 			}
-
+			while (reader.TokenType != JsonToken.EndObject && (reader.Value as string).Contains("_as_string"))
+			{
+				// std_deviation_bounds is an object, so we need to skip its properties
+				if ((reader.Value as string).Equals("std_deviation_bounds_as_string"))
+				{
+					reader.Read();
+					reader.Read();
+					reader.Read();
+					reader.Read();
+				}
+				reader.Read();
+				reader.Read();
+			}
 			return extendedStatsMetric;
 		}
 

src/Tests/Nest.Tests.Integration/Cluster/NodeTests.cs

@@ -64,10 +64,10 @@ public void NodesHotThreads()
 			);
 
 			r.IsValid.Should().BeTrue();
-			r.HotThreads.Count.Should().BeGreaterOrEqualTo(1);
+			r.HotThreads.Count.Should().BeGreaterThan(0);
 			var hotThreadInfo = r.HotThreads.First();
 			hotThreadInfo.Node.Should().NotBeNullOrEmpty();
-			hotThreadInfo.Threads.Count.Should().BeGreaterThan(1);
+			hotThreadInfo.Threads.Count.Should().BeGreaterThan(0);
 		}
 	}
 }

src/Tests/Nest.Tests.Integration/Core/MultiPercolate/MultiPercolateTests.cs

@@ -155,24 +155,15 @@ public void MultiPercolate_PrecolateMany_ReturnsExpectedResults()
 			multiPercolateResponse.IsValid.Should().BeTrue();
 
 			var percolateResponses = multiPercolateResponse.Responses.ToList();
-			percolateResponses.Should().NotBeEmpty().And.HaveCount(4);
-
-			var percolateResponse = percolateResponses[0];
-			percolateResponse.Total.Should().Be(10);
-			percolateResponse.Matches.Should().HaveCount(10);
-
-			var existingResponse = percolateResponses[1];
-			existingResponse.Total.Should().Be(10);
-			existingResponse.Matches.Should().HaveCount(10);
-
-			var countResponse = percolateResponses[2];
-			countResponse.Total.Should().Be(2);
-			countResponse.Matches.Should().BeNull();
+			percolateResponses.Should().NotBeEmpty().And.HaveCount(2);
 
-			var errorResponse = percolateResponses[3];
-			errorResponse.Total.Should().Be(0);
-			errorResponse.ServerError.Error.Should().NotBeNullOrWhiteSpace();
+			var percolateResponse1 = percolateResponses[0];
+			percolateResponse1.Total.Should().Be(10);
+			percolateResponse1.Matches.Should().HaveCount(10);
 
+			var percolateResponse2 = percolateResponses[1];
+			percolateResponse2.Total.Should().Be(10);
+			percolateResponse2.Matches.Should().HaveCount(10);
 		}
 	}
 }

src/Tests/Nest.Tests.Integration/Core/Repository/RestoreTests.cs

@@ -132,8 +132,7 @@ public void SnapshotRestore_IndexSettings()
 
 			var indexSettingsResponse = this.Client.GetIndexSettings(descriptor => descriptor.Index(_restoredIndexName));
 			indexSettingsResponse.IsValid.Should().BeTrue();
-			indexSettingsResponse.IndexSettings.Settings[UpdatableSettings.RefreshInterval].Should().Be("123s");
-			indexSettingsResponse.IndexSettings.Settings[UpdatableSettings.BlocksWrite].Should().BeNull();
+			indexSettingsResponse.IndexSettings.Settings["refresh_interval"].Should().Be("123s");
 		}
 
 		[Test]