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

Mpdreamz · Mpdreamz · commit 8a2e21b1f5f4 · 2014-07-09T16:09:09.000+02:00
diff --git a/src/Nest/Resolvers/Converters/Aggregations/AggregationConverter.cs b/src/Nest/Resolvers/Converters/Aggregations/AggregationConverter.cs
@@ -182,7 +182,7 @@ private IAggregation GetKeyedBucketItem(JsonReader reader, JsonSerializer serial
 
 			if (property == "key_as_string")
 			{
-				// Skip key_as_string property for backwards compatibility (< ES 1.2)
+				// Skip key_as_string property
 				reader.Read();
 				reader.Read();
 			}

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ private IAggregation GetKeyedBucketItem(JsonReader reader, JsonSerializer serial`
`182`	`182`
`183`	`183`	`if (property == "key_as_string")`
`184`	`184`	`{`
`185`		`- // Skip key_as_string property for backwards compatibility (< ES 1.2)`
	`185`	`+ // Skip key_as_string property`
`186`	`186`	`reader.Read();`
`187`	`187`	`reader.Read();`
`188`	`188`	`}`