Merge branch 'master' into feature/ingest-api

# Conflicts:
#	src/Nest/Nest.csproj
#	src/Tests/Tests.csproj

Author: russcam

build.bat

@@ -12,7 +12,7 @@ REM - elasticsearch_versions can be multiple separated with a semi-colon ';'
 if errorlevel 1 (
   exit /b %errorlevel%
 )
-.paket\paket.exe install
+.paket\paket.exe restore
 if errorlevel 1 (
   exit /b %errorlevel%
 )
@@ -23,7 +23,7 @@ SET ESVERSIONS=
 SET DNXVERSION="default"
 SET SKIPTESTS=0
 SET APIKEY=
-
+SET FEED="elasticsearch-net"
 
 IF /I "%1"=="skiptests" (
 	set SKIPTESTS="1"
@@ -51,8 +51,7 @@ IF /I "%1%"=="integrate" (
 
 IF /I "%1%"=="canary" (
 	IF NOT [%2]==[] (set APIKEY="%2")
-	IF /I "%3"=="skiptests" (set SKIPTESTS=1)
-	IF /I "%2"=="skiptests" (set SKIPTESTS=1)
+	IF NOT [%3]==[] (set FEED="%3")
 )
 
-"packages\build\FAKE\tools\Fake.exe" "build\\scripts\\Targets.fsx" "target=%TARGET%" "version=%VERSION%" "esversions=%ESVERSIONS%" "skiptests=%SKIPTESTS%" "apiKey=%APIKEY%"
+"packages\build\FAKE\tools\Fake.exe" "build\\scripts\\Targets.fsx" "target=%TARGET%" "version=%VERSION%" "esversions=%ESVERSIONS%" "skiptests=%SKIPTESTS%" "apiKey=%APIKEY%" "feed=%FEED%" 

build/scripts/Releasing.fsx

@@ -102,10 +102,11 @@ type Release() =
             MoveFile Paths.NugetOutput package
         )
 
-    static member PublishCanaryBuild accessKey = 
+    static member PublishCanaryBuild accessKey feed = 
         !! "build/output/_packages/*-ci*.nupkg"
         |> Seq.iter(fun f -> 
-            let success = Tooling.execProcess (Tooling.NugetFile()) ["push"; f; accessKey; "-source"; "https://www.myget.org/F/elasticsearch-net/api/v2/package"] 
+            let source = "https://www.myget.org/F/" + feed + "/api/v2/package"
+            let success = Tooling.execProcess (Tooling.NugetFile()) ["push"; f; accessKey; "-source"; source] 
             match success with
             | 0 -> traceFAKE "publish to myget succeeded" |> ignore
             | _ -> failwith "publish to myget failed" |> ignore

build/scripts/Targets.fsx

@@ -37,13 +37,13 @@ Target "Clean" <| fun _ -> CleanDir Paths.BuildOutput
 
 Target "BuildApp" <| fun _ -> Build.Compile()
 
-Target "Test"  <| fun _ -> Tests.RunUnitTests()
+Target "Test" <| fun _ -> Tests.RunUnitTests()
 
-Target "QuickTest"  <| fun _ -> Tests.RunUnitTests()
+Target "QuickTest" <| fun _ -> Tests.RunUnitTests()
 
-Target "Integrate"  <| fun _ -> Tests.RunIntegrationTests() (getBuildParamOrDefault "esversions" "")
+Target "Integrate" <| fun _ -> Tests.RunIntegrationTests() (getBuildParamOrDefault "esversions" "")
 
-Target "WatchTests"  <| fun _ -> 
+Target "WatchTests" <| fun _ -> 
     traceFAKE "Starting quick test (incremental compile then test)"
     use watcher = (!! "src/Tests/**/*.cs").And("src/Tests/**/*.md") |> WatchChanges (fun changes -> 
             printfn "%A" changes
@@ -59,7 +59,7 @@ Target "Profile" <| fun _ -> Profiler.Run()
 
 Target "Benchmark" <| fun _ -> Benchmarker.Run()
 
-Target "QuickCompile"  <| fun _ -> Build.QuickCompile()
+Target "QuickCompile" <| fun _ -> Build.QuickCompile()
 
 Target "Version" <| fun _ -> 
     Versioning.PatchAssemblyInfos()
@@ -74,7 +74,8 @@ Target "Release" <| fun _ ->
 Target "Canary" <| fun _ -> 
     trace "Running canary build" 
     let apiKey = (getBuildParam "apikey");
-    if (not (String.IsNullOrWhiteSpace apiKey) || apiKey = "ignore") then Release.PublishCanaryBuild apiKey
+    let feed = (getBuildParamOrDefault "feed" "elasticsearch-net");
+    if (not (String.IsNullOrWhiteSpace apiKey) || apiKey = "ignore") then Release.PublishCanaryBuild apiKey feed
 
 BuildFailureTarget "NotifyTestFailures" <| fun _ -> Tests.Notify() |> ignore
 

docs/asciidoc/aggregations/bucket/filter/filter-aggregation-usage.asciidoc

@@ -7,7 +7,7 @@
 [[filter-aggregation-usage]]
 == Filter Aggregation Usage
 
-Defines a single bucket of all the documents in the current document set context that match a specified filter. 
+Defines a single bucket of all the documents in the current document set context that match a specified filter.
 Often this will be used to narrow down the current aggregation context to a specific set of documents.
 
 Be sure to read the Elasticsearch documentation on {ref_current}/search-aggregations-bucket-filter-aggregation.html[Filter Aggregation]

docs/asciidoc/aggregations/pipeline/moving-average/moving-average-ewma-aggregation-usage.asciidoc

@@ -45,7 +45,7 @@ new SearchRequest<Project>()
     {
         Field = "startedOn",
         Interval = DateInterval.Month,
-        Aggregations = 
+        Aggregations =
             new SumAggregation("commits", "numberOfCommits") &&
             new MovingAverageAggregation("commits_moving_avg", "commits")
             {

docs/asciidoc/aggregations/pipeline/moving-average/moving-average-holt-linear-aggregation-usage.asciidoc

@@ -46,7 +46,7 @@ new SearchRequest<Project>()
     {
         Field = "startedOn",
         Interval = DateInterval.Month,
-        Aggregations = 
+        Aggregations =
             new SumAggregation("commits", "numberOfCommits") &&
             new MovingAverageAggregation("commits_moving_avg", "commits")
             {

docs/asciidoc/aggregations/pipeline/moving-average/moving-average-holt-winters-aggregation-usage.asciidoc

@@ -51,7 +51,7 @@ new SearchRequest<Project>()
     {
         Field = "startedOn",
         Interval = DateInterval.Month,
-        Aggregations = 
+        Aggregations =
             new SumAggregation("commits", "numberOfCommits") &&
             new MovingAverageAggregation("commits_moving_avg", "commits")
             {

docs/asciidoc/aggregations/pipeline/moving-average/moving-average-linear-aggregation-usage.asciidoc

@@ -44,7 +44,7 @@ new SearchRequest<Project>()
     {
         Field = "startedOn",
         Interval = DateInterval.Month,
-        Aggregations = 
+        Aggregations =
             new SumAggregation("commits", "numberOfCommits") &&
             new MovingAverageAggregation("commits_moving_avg", "commits")
             {

docs/asciidoc/aggregations/pipeline/moving-average/moving-average-simple-aggregation-usage.asciidoc

@@ -45,7 +45,7 @@ new SearchRequest<Project>()
     {
         Field = "startedOn",
         Interval = DateInterval.Month,
-        Aggregations = 
+        Aggregations =
             new SumAggregation("commits", "numberOfCommits") &&
             new MovingAverageAggregation("commits_moving_avg", "commits")
             {

docs/asciidoc/client-concepts/connection-pooling/building-blocks/date-time-providers.asciidoc

@@ -7,7 +7,7 @@
 [[date-time-providers]]
 == Date time providers
 
-Not typically something you'll have to pass to the client but all calls to `System.DateTime.UtcNow` 
+Not typically something you'll have to pass to the client but all calls to `System.DateTime.UtcNow`
 in the client have been abstracted by `IDateTimeProvider`. This allows us to unit test timeouts and cluster failover
 without being bound to wall clock time as calculated by using `System.DateTime.UtcNow` directly.
 
@@ -45,7 +45,7 @@ var maxTimeout = TimeSpan.FromMinutes(30);
 Plotting these defaults looks as followed:
 
 [[timeout]]
-.Default formula, x-axis time in minutes, y-axis number of attempts to revive
+.Default formula, x-axis number of attempts to revive, y-axis time in minutes
 image::timeoutplot.png[dead timeout]
 
 The goal here is that whenever a node is resurrected and is found to still be offline, we send it_back to the doghouse_ for an ever increasingly long period, until we hit a bounded maximum.