Merge branch 'feature/2.x-reindex-rethrottle' into 2.x

Author: russcam

src/CodeGeneration/ApiGenerator/Domain/ApiQueryParameters.cs

@@ -28,9 +28,15 @@ public string CsharpType(string paramName)
 					return "params string[]";
 				case "integer":
 				case "number":
-					return new [] {"boost", "percen", "score"}.Any(s=>paramName.ToLowerInvariant().Contains(s))
-						? "double"
-						: "long";
+					if (new[] { "boost", "percen", "score" }.Any(s => paramName.ToLowerInvariant().Contains(s)))
+					{
+						return "double";
+					}
+					if (new[] { "requests_per_second" }.Any(s => paramName.ToLowerInvariant().Contains(s)))
+					{
+						return "float";
+					}
+					return "long";
 				case "duration":
 				case "time":
 					return "TimeSpan";

src/CodeGeneration/ApiGenerator/Overrides/Descriptors/ReindexRethrottleDescriptorOverrides.cs

@@ -9,6 +9,8 @@ public override CsharpMethod PatchMethod(CsharpMethod method)
 		{
 			var requestParam = method.Url.Params.First(p => p.Key == "requests_per_second");
 
+			requestParam.Value.Description = "The throttle to set on this request in sub-requests per second. float.PositiveInfinity means set no throttle.";
+
 			//Handle float.PositiveInfinity as though "unlimited"
 			requestParam.Value.Generator = (fieldType, mm, original, setter) =>
 				$"public {fieldType} {mm} {{ " +

src/CodeGeneration/ApiGenerator/RestSpecification/Core/bulk.json

@@ -1,6 +1,6 @@
 {
   "bulk": {
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/2.3/docs-bulk.html",
+    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/docs-bulk.html",
     "methods": ["POST", "PUT"],
     "url": {
       "path": "/_bulk",

src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.aliases.json

@@ -1,6 +1,6 @@
 {
   "cat.aliases": {
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/2.3/cat-alias.html",
+    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-alias.html",
     "methods": ["GET"],
     "url": {
       "path": "/_cat/aliases",

src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.allocation.json

@@ -1,6 +1,6 @@
 {
   "cat.allocation": {
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/2.3/cat-allocation.html",
+    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-allocation.html",
     "methods": ["GET"],
     "url": {
       "path": "/_cat/allocation",

src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.count.json

@@ -1,6 +1,6 @@
 {
   "cat.count": {
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/2.3/cat-count.html",
+    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-count.html",
     "methods": ["GET"],
     "url": {
       "path": "/_cat/count",

src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.fielddata.json

@@ -1,6 +1,6 @@
 {
   "cat.fielddata": {
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/2.3/cat-fielddata.html",
+    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-fielddata.html",
     "methods": ["GET"],
     "url": {
       "path": "/_cat/fielddata",

src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.health.json

@@ -1,6 +1,6 @@
 {
   "cat.health": {
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/2.3/cat-health.html",
+    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-health.html",
     "methods": ["GET"],
     "url": {
       "path": "/_cat/health",

src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.help.json

@@ -1,6 +1,6 @@
 {
   "cat.help": {
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/2.3/cat.html",
+    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/cat.html",
     "methods": ["GET"],
     "url": {
       "path": "/_cat",

src/CodeGeneration/ApiGenerator/RestSpecification/Core/cat.indices.json

@@ -1,6 +1,6 @@
 {
   "cat.indices": {
-    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/2.3/cat-indices.html",
+    "documentation": "http://www.elastic.co/guide/en/elasticsearch/reference/master/cat-indices.html",
     "methods": ["GET"],
     "url": {
       "path": "/_cat/indices",