Merge branch 'feature/ingest-api' of https://github.com/elastic/elasticsearch-net into feature/ingest-api

Author: gmarz

src/Nest/Nest.csproj

@@ -758,9 +758,7 @@
     <Compile Include="Ingest\Processors\TrimProcessor.cs" />
     <Compile Include="Ingest\Processors\SplitProcessor.cs" />
     <Compile Include="Ingest\Processors\SetProcessor.cs" />
-    <Compile Include="Ingest\Processors\AppendProcessor.cs" />
     <Compile Include="Ingest\Processors\RenameProcessor.cs" />
-    <Compile Include="Ingest\Processors\ConvertProcessor.cs" />
     <Compile Include="Ingest\Processors\RemoveProcessor.cs" />
     <Compile Include="Ingest\Processors\LowercaseProcessor.cs" />
     <Compile Include="Ingest\Processors\JoinProcessor.cs" />
@@ -769,6 +767,8 @@
     <Compile Include="Ingest\Processors\ForeachProcessor.cs" />
     <Compile Include="Ingest\Processors\FailProcessor.cs" />
     <Compile Include="Ingest\Processors\DateProcessor.cs" />
+    <Compile Include="Ingest\Processors\ConvertProcessor.cs" />
+    <Compile Include="Ingest\Processors\AppendProcessor.cs" />
     <Compile Include="Ingest\SimulatePipeline\ElasticClient-SimulatePipeline.cs" />
     <Compile Include="Ingest\SimulatePipeline\SimulatePipelineRequest.cs" />
     <Compile Include="Ingest\SimulatePipeline\SimulatePiipelineResponse.cs" />
@@ -1269,6 +1269,7 @@
   <ItemGroup>
     <None Include="paket.references" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

src/Tests/Ingest/PutPipeline/PutPipelineApiTests.cs

@@ -28,7 +28,6 @@ protected override LazyResponses ClientUsage() => Calls(
 
 		protected override object ExpectJson { get; } = new
 		{
-			script = "1+1"
 		};
 
 		protected override PutPipelineDescriptor NewDescriptor() => new PutPipelineDescriptor(_id);