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

Conflicts:
	src/Nest/DSL/_Requests.generated.cs
	src/Nest/Nest.csproj
	src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj

Author: Mpdreamz

Diff for: src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/SearchDescriptorOverrides.cs

@@ -25,7 +25,8 @@ public IEnumerable<string> SkipQueryStringParams
 					"sort",
 					"_source",
 					"_source_include",
-					"_source_exclude"
+					"_source_exclude",
+					"track_scores"
 				};
 			}
 		}

Diff for: src/Elasticsearch.Net/Domain/RequestParameters/RequestParameters.Generated.cs

@@ -1683,6 +1683,26 @@ public DeleteByQueryRequestParameters Timeout(string timeout)
 	}
 
 
+	///<summary>Request parameters descriptor for DeleteScript
+	///<pre>
+	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/modules-scripting.html
+	///</pre>
+	///</summary>
+	public class DeleteScriptRequestParameters : FluentRequestParameters<DeleteScriptRequestParameters> 
+	{
+	}
+	
+	
+	///<summary>Request parameters descriptor for DeleteTemplate
+	///<pre>
+	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-template.html
+	///</pre>
+	///</summary>
+	public class DeleteTemplateRequestParameters : FluentRequestParameters<DeleteTemplateRequestParameters> 
+	{
+	}
+	
+	
 	///<summary>Request parameters descriptor for Exists
 	///<pre>
 	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/docs-get.html
@@ -2043,6 +2063,16 @@ public GetRequestParameters VersionType(VersionType version_type)
 	}
 
 
+	///<summary>Request parameters descriptor for GetScript
+	///<pre>
+	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/modules-scripting.html
+	///</pre>
+	///</summary>
+	public class GetScriptRequestParameters : FluentRequestParameters<GetScriptRequestParameters> 
+	{
+	}
+	
+	
 	///<summary>Request parameters descriptor for GetSource
 	///<pre>
 	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/docs-get.html
@@ -2163,6 +2193,16 @@ public SourceRequestParameters VersionType(VersionType version_type)
 	}
 
 
+	///<summary>Request parameters descriptor for GetTemplate
+	///<pre>
+	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/search-template.html
+	///</pre>
+	///</summary>
+	public class GetTemplateRequestParameters : FluentRequestParameters<GetTemplateRequestParameters> 
+	{
+	}
+	
+	
 	///<summary>Request parameters descriptor for Index
 	///<pre>
 	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/docs-index_.html
@@ -2683,36 +2723,6 @@ public DeleteMappingRequestParameters MasterTimeout(string master_timeout)
 	}
 
 
-	///<summary>Request parameters descriptor for IndicesDeleteTemplateForAll
-	///<pre>
-	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/indices-templates.html
-	///</pre>
-	///</summary>
-	public class DeleteTemplateRequestParameters : FluentRequestParameters<DeleteTemplateRequestParameters> 
-	{
-		
-		internal string _timeout { get; set; }
-		///<summary>Explicit operation timeout</summary>
-		public DeleteTemplateRequestParameters Timeout(string timeout)
-		{
-			this._timeout = timeout;
-			this.AddQueryString("timeout", this._timeout);
-			return this;
-		}
-		
-		
-		internal string _master_timeout { get; set; }
-		///<summary>Specify timeout for connection to master</summary>
-		public DeleteTemplateRequestParameters MasterTimeout(string master_timeout)
-		{
-			this._master_timeout = master_timeout;
-			this.AddQueryString("master_timeout", this._master_timeout);
-			return this;
-		}
-		
-	}
-	
-	
 	///<summary>Request parameters descriptor for IndicesDeleteWarmer
 	///<pre>
 	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/indices-warmers.html
@@ -3213,36 +3223,6 @@ public GetIndexSettingsRequestParameters Local(bool local)
 	}
 
 
-	///<summary>Request parameters descriptor for IndicesGetTemplateForAll
-	///<pre>
-	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/indices-templates.html
-	///</pre>
-	///</summary>
-	public class GetTemplateRequestParameters : FluentRequestParameters<GetTemplateRequestParameters> 
-	{
-		
-		internal bool _flat_settings { get; set; }
-		///<summary>Return settings in flat format (default: false)</summary>
-		public GetTemplateRequestParameters FlatSettings(bool flat_settings)
-		{
-			this._flat_settings = flat_settings;
-			this.AddQueryString("flat_settings", this._flat_settings);
-			return this;
-		}
-		
-		
-		internal bool _local { get; set; }
-		///<summary>Return local information, do not retrieve the state from master node (default: false)</summary>
-		public GetTemplateRequestParameters Local(bool local)
-		{
-			this._local = local;
-			this.AddQueryString("local", this._local);
-			return this;
-		}
-		
-	}
-	
-	
 	///<summary>Request parameters descriptor for IndicesGetWarmerForAll
 	///<pre>
 	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/indices-warmers.html
@@ -3621,6 +3601,16 @@ public UpdateSettingsRequestParameters FlatSettings(bool flat_settings)
 	public class PutTemplateRequestParameters : FluentRequestParameters<PutTemplateRequestParameters> 
 	{
 
+		internal bool _create { get; set; }
+		///<summary>Whether the index template should only be added if new or can also replace an existing one</summary>
+		public PutTemplateRequestParameters Create(bool create)
+		{
+			this._create = create;
+			this.AddQueryString("create", this._create);
+			return this;
+		}
+		
+		
 		internal string _timeout { get; set; }
 		///<summary>Explicit operation timeout</summary>
 		public PutTemplateRequestParameters Timeout(string timeout)
@@ -3901,9 +3891,9 @@ public IndicesStatsRequestParameters Fields(params string[] fields)
 		}
 
 
-		internal bool _groups { get; set; }
+		internal  string[] _groups { get; set; }
 		///<summary>A comma-separated list of search groups for `search` index metric</summary>
-		public IndicesStatsRequestParameters Groups(bool groups)
+		public IndicesStatsRequestParameters Groups(params string[] groups)
 		{
 			this._groups = groups;
 			this.AddQueryString("groups", this._groups);
@@ -4893,6 +4883,16 @@ public class PingRequestParameters : FluentRequestParameters<PingRequestParamete
 	}
 
 
+	///<summary>Request parameters descriptor for PutScript
+	///<pre>
+	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/master/modules-scripting.html
+	///</pre>
+	///</summary>
+	public class PutScriptRequestParameters : FluentRequestParameters<PutScriptRequestParameters> 
+	{
+	}
+	
+	
 	///<summary>Request parameters descriptor for ScrollGet
 	///<pre>
 	///http://www.elasticsearch.org/guide/en/elasticsearch/reference/1.x/search-request-scroll.html