Merge branch 'master' of https://github.com/sumithub/elasticsearch-net into sumithub-master

russcam · russcam · commit 686fa9c4e506 · 2016-07-04T09:14:36.000+10:00
# Conflicts:
#	src/Nest/Document/Multiple/ReindexOnServer/ReindexSource.cs
#	src/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerApiTests.cs
diff --git a/src/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerApiTests.cs b/src/Tests/Document/Multiple/ReindexOnServer/ReindexOnServerApiTests.cs
@@ -133,7 +133,7 @@ protected override void ExpectResponse(IReindexOnServerResponse response)
 					sort = new [] { new { id = new { order = "asc" } } },
 					type = new [] { "test" },
                     size = 100
-                }
+				}
 			};
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ protected override void ExpectResponse(IReindexOnServerResponse response)`
`133`	`133`	`sort = new [] { new { id = new { order = "asc" } } },`
`134`	`134`	`type = new [] { "test" },`
`135`	`135`	`size = 100`
`136`		`- }`
	`136`	`+ }`
`137`	`137`	`};`
`138`	`138`	`}`
`139`	`139`	`}`