Merge branch 'master' into feature/sql

Original commit: elastic/x-pack-elasticsearch@9fc67cbfee

docs/en/ml/limitations.asciidoc

@@ -12,16 +12,6 @@ The {xpackml} features in {kib} use pop-ups. You must configure your
 web browser so that it does not block pop-up windows or create an
 exception for your {kib} URL.
 
-[float]
-=== Jobs must be re-created at GA
-//See x-pack-elasticsearch/#844
-
-The models that you create in the {xpackml} Beta cannot be upgraded.
-After the {xpackml} features become generally available, you must
-re-create your jobs. If you have data sets and job configurations that
-you work with extensively in the beta, make note of all the details so
-that you can re-create them successfully.
-
 [float]
 === {xpackml} features do not yet support cross cluster search
 

plugin/src/test/java/org/elasticsearch/xpack/graph/test/GraphTests.java

@@ -101,6 +101,7 @@ public class GraphTests extends XPackSingleNodeTestCase {
         // issue https://github.com/elastic/x-pack-elasticsearch/issues/918
         ForceMergeResponse actionGet = client().admin().indices().prepareForceMerge("test").setFlush(true).setMaxNumSegments(1)
                 .execute().actionGet();
+        client().admin().indices().prepareRefresh("test").get();
         assertAllSuccessful(actionGet);
         for (IndexShardSegments seg : client().admin().indices().prepareSegments().get().getIndices().get("test")) {
             ShardSegments[] shards = seg.getShards();

plugin/src/test/java/org/elasticsearch/xpack/watcher/test/integration/HistoryIntegrationTests.java

@@ -99,7 +99,7 @@ public class HistoryIntegrationTests extends AbstractWatcherIntegrationTestCase
         ensureWatcherStarted();
         watcherClient().prepareExecuteWatch("test_watch").setRecordExecution(true).get();
 
-        flush(".watcher-history*");
+        refresh(".watcher-history*");
         SearchResponse searchResponse = client().prepareSearch(".watcher-history*").setSize(0).get();
         assertHitCount(searchResponse, 1);
 
@@ -137,7 +137,7 @@ public class HistoryIntegrationTests extends AbstractWatcherIntegrationTestCase
 
         watcherClient().prepareExecuteWatch("test_watch").setRecordExecution(true).get();
 
-        flush(".watcher-history*");
+        refresh(".watcher-history*");
         SearchResponse searchResponse = client().prepareSearch(".watcher-history*").setSize(0).get();
         assertHitCount(searchResponse, 1);
 

qa/rolling-upgrade/src/test/resources/rest-api-spec/test/mixed_cluster/10_basic.yml

@@ -53,7 +53,7 @@ setup:
        body: {"f1": "v8_mixed", "f2": 12}
 
  - do:
-     indices.flush:
+     indices.refresh:
         index: test_index
 
  - do:
@@ -81,7 +81,7 @@ setup:
        id: d12
 
  - do:
-     indices.flush:
+     indices.refresh:
         index: test_index
 
 ---

qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/10_basic.yml

@@ -24,10 +24,6 @@
           - '{"index": {"_index": "test_index", "_type": "test_type"}}'
           - '{"f1": "v5_old", "f2": 4}'
 
- - do:
-     indices.flush:
-        index: test_index
-
  - do:
      search:
         index: test_index

qa/rolling-upgrade/src/test/resources/rest-api-spec/test/old_cluster/50_token_auth.yml

@@ -65,12 +65,6 @@
           - '{"index": {"_index": "token_index", "_type": "doc", "_id" : "5"}}'
           - '{"f1": "v5_old", "f2": 4}'
 
-  - do:
-      headers:
-        Authorization: Bearer ${token}
-      indices.flush:
-        index: token_index
-
   - do:
       headers:
         Authorization: Bearer ${token}

qa/rolling-upgrade/src/test/resources/rest-api-spec/test/upgraded_cluster/10_basic.yml

@@ -29,10 +29,6 @@
           - '{"index": {"_index": "test_index", "_type": "test_type"}}'
           - '{"f1": "v5_upgraded", "f2": 14}'
 
- - do:
-     indices.flush:
-        index: test_index
-
  - do:
      search:
         index: test_index