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

Author: Mpdreamz

src/Tests/Nest.Tests.Unit/Core/Map/DynamicTemplates/CompletelyGenericTemplate.json

@@ -5,7 +5,7 @@
         "store_generic": {
           "match": "*",
           "mapping": {
-            "store": "yes"
+            "store": true
           }
         }
       }

src/Tests/Nest.Tests.Unit/Core/Map/DynamicTemplates/MultiFieldWithGenericTypes.json

@@ -8,12 +8,12 @@
           "fields": {
             "{name}": {
               "type": "{dynamic_type}",
-              "store": "no",
+              "store": false,
               "index": "analyzed"
             },
             "org": {
               "type": "{dynamic_type}",
-              "store": "yes",
+              "store": true,
               "index": "not_analyzed"
             },
             "suggest": {

src/Tests/Nest.Tests.Unit/Core/Map/Properties/PropertiesTests.cs

@@ -31,6 +31,7 @@ public void StringProperty()
 						.TermVector(TermVectorOption.WithPositionsOffsets)
 						.Boost(1.1)
 						.CopyTo(p => p.Content, p => p.Country)
+						.IgnoreAbove(20)
 					)
 				)
 			);

src/Tests/Nest.Tests.Unit/Core/Map/Properties/StringProperty.json

@@ -1,27 +1,28 @@
 {
-	"elasticsearchprojects": {
-		"properties": {
-			"name": {
-				"type": "string",
-				"similarity": "mysimilarity",
-				"index_name": "my_crazy_name_i_want_in_lucene",
-				"store": true,
-				"index": "analyzed",
-				"term_vector": "with_positions_offsets",
-				"boost": 1.1,
-				"null_value": "my_special_null_value",
-				"norms": {
+  "elasticsearchprojects": {
+    "properties": {
+      "name": {
+        "type": "string",
+        "similarity": "mysimilarity",
+        "index_name": "my_crazy_name_i_want_in_lucene",
+        "store": true,
+        "index": "analyzed",
+        "term_vector": "with_positions_offsets",
+        "boost": 1.1,
+        "null_value": "my_special_null_value",
+        "norms": {
           "enabled": true,
           "loading": "eager"
         },
-				"omit_norms": true,
-				"index_options": "positions",
-				"index_analyzer": "standard",
-				"search_analyzer": "standard",
-				"include_in_all": true,
-				"position_offset_gap": 1,
-				"copy_to": [ "content", "country" ]
-			}
-		}
-	}
+        "omit_norms": true,
+        "index_options": "positions",
+        "index_analyzer": "standard",
+        "ignore_above": 20,
+        "search_analyzer": "standard",
+        "include_in_all": true,
+        "position_offset_gap": 1,
+        "copy_to": [ "content", "country" ]
+      }
+    }
+  }
 }