Add conflicts to Reindex API

closes #2219

Author: russcam

build/scripts/Testing.fsx

@@ -11,7 +11,8 @@ open Projects
 module Tests = 
     let private testProjectJson parallelization =
         let p = Paths.Source "Tests/project.json"
-        Tooling.DotNet.Exec ["restore"; p;]
+        Tooling.DotNet.Exec ["restore"; p; "--verbosity Warning"]
+        Tooling.DotNet.Exec ["build"; p; "--configuration Release"; "-f"; "netcoreapp1.0"]
         Tooling.DotNet.Exec ["test"; p; "-parallel"; parallelization; "-xml"; Paths.Output("TestResults-Core-Clr.xml")]
 
     let private testDesktopClr parallelization = 

src/Nest/Document/Multiple/ReindexOnServer/ReindexOnServerRequest.cs

@@ -1,6 +1,8 @@
 using System;
 using System.CodeDom;
+using Elasticsearch.Net;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace Nest
 {
@@ -17,6 +19,10 @@ public partial interface IReindexOnServerRequest
 
 		[JsonProperty("size")]
 		long? Size { get; set; }
+
+        [JsonProperty("conflicts")]
+        [JsonConverter(typeof(StringEnumConverter))]
+		Conflicts? Conflicts { get; set; }
 	}
 
 	public partial class ReindexOnServerRequest
@@ -25,6 +31,7 @@ public partial class ReindexOnServerRequest
 		public IReindexDestination Destination { get; set; }
 		public IScript Script { get; set; }
 		public long? Size { get; set; }
+		public Conflicts? Conflicts { get; set; }
 	}
 
 	[DescriptorFor("Reindex")]
@@ -34,6 +41,7 @@ public partial class ReindexOnServerDescriptor
 		IReindexDestination IReindexOnServerRequest.Destination { get; set; }
 		IScript IReindexOnServerRequest.Script { get; set; }
 		long? IReindexOnServerRequest.Size { get; set; }
+		Conflicts? IReindexOnServerRequest.Conflicts { get; set; }
 
 		public ReindexOnServerDescriptor Source(Func<ReindexSourceDescriptor, IReindexSource> selector = null) =>
 			Assign(a => a.Source = selector.InvokeOrDefault(new ReindexSourceDescriptor()));
@@ -47,5 +55,7 @@ public ReindexOnServerDescriptor Script(Func<ScriptDescriptor, IScript> scriptSe
 			Assign(a => a.Script = scriptSelector?.Invoke(new ScriptDescriptor()));
 
 		public ReindexOnServerDescriptor Size(long? size) => Assign(a => a.Size = size);
+
+		public ReindexOnServerDescriptor Conflicts(Conflicts conflicts) => Assign(a => a.Conflicts = conflicts);
 	}
 }

src/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerApiTests.cs

@@ -72,6 +72,7 @@ protected override LazyResponses ClientUsage() => Calls(
 				.Routing(ReindexRouting.Discard)
 			)
 			.Script(_script)
+            .Conflicts(Conflicts.Proceed)
 			.Refresh();
 
 		protected override ReindexOnServerRequest Initializer => new ReindexOnServerRequest()
@@ -94,6 +95,7 @@ protected override LazyResponses ClientUsage() => Calls(
 				Routing = ReindexRouting.Discard
 			},
 			Script = new InlineScript(_script),
+            Conflicts = Conflicts.Proceed,
 			Refresh = true,
 		};
 
@@ -133,7 +135,8 @@ protected override void ExpectResponse(IReindexOnServerResponse response)
 					sort = new [] { new { id = new { order = "asc" } } },
 					type = new [] { "test" },
 					size = 100
-				}
+				},
+                conflicts = "proceed"
 			};
 	}
 }

src/Tests/tests.yaml

@@ -1,5 +1,5 @@
 # mode either u (unit test), i (integration test) or m (mixed mode)
-mode: u
+mode: m
 # the elasticsearch version that should be started
 elasticsearch_version: 2.3.5
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running