Revert "temporary merge PR 32743 (#32776)"

This reverts commit 1a00847.
elastic · Sep 5, 2018 · a0b72c9 · a0b72c9
1 parent e6d58c5
commit a0b72c9
Show file tree

Hide file tree

Showing 24 changed files with 425 additions and 729 deletions.
diff --git a/x-pack/docs/en/rest-api/rollup/get-job.asciidoc b/x-pack/docs/en/rest-api/rollup/get-job.asciidoc
@@ -99,7 +99,7 @@ Which will yield the following response:
           "stats" : {
             "pages_processed" : 0,
             "documents_processed" : 0,
-            "documents_indexed" : 0,
+            "rollups_indexed" : 0,
             "trigger_count" : 0
           }
         }
@@ -219,7 +219,7 @@ Which will yield the following response:
           "stats" : {
             "pages_processed" : 0,
             "documents_processed" : 0,
-            "documents_indexed" : 0,
+            "rollups_indexed" : 0,
             "trigger_count" : 0
           }
         },
@@ -268,7 +268,7 @@ Which will yield the following response:
           "stats" : {
             "pages_processed" : 0,
             "documents_processed" : 0,
-            "documents_indexed" : 0,
+            "rollups_indexed" : 0,
             "trigger_count" : 0
           }
         }

diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/Iteration.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/indexing/Iteration.java