Merge branch 'master' into not-the-primary

* master:
  [TEST] Fail test if dummy doc is not found
  Test awaits Lucene snapshot upgrade
  Merge pull request #16371 from clintongormley/deprecate-multicast
  Merge pull request #16345 from lbrito1/patch-1
  Fix minor typo in migrate_3_0.asciidoc

Author: jasontedor

core/src/test/java/org/elasticsearch/bwcompat/OldIndexBackwardsCompatibilityIT.java

@@ -279,6 +279,7 @@ public void testAllVersionsTested() throws Exception {
         }
     }
 
+    @AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/16373")
     public void testOldIndexes() throws Exception {
         setupCluster();
 

docs/reference/aggregations/pipeline.asciidoc

@@ -22,7 +22,7 @@ parameter to indicate the paths to the required metrics. The syntax for defining
 
 Pipeline aggregations cannot have sub-aggregations but depending on the type it can reference another pipeline in the `buckets_path`
 allowing pipeline aggregations to be chained.  For example, you can chain together two derivatives to calculate the second derivative
-(e.g. a derivative of a derivative).
+(i.e. a derivative of a derivative).
 
 NOTE: Because pipeline aggregations only add to the output, when chaining pipeline aggregations the output of each pipeline aggregation 
 will be included in the final output.

docs/reference/migration/migrate_2_2.asciidoc

@@ -48,3 +48,8 @@ Proxy settings have been deprecated and renamed:
 If you are using proxy settings, update your settings as deprecated ones will
 be removed in next major version.
 
+[float]
+=== Multicast plugin deprecated
+
+The `discovery-multicast` plugin has been deprecated in 2.2.0 and has
+been removed in 3.0.0.

docs/reference/migration/migrate_3_0.asciidoc

@@ -166,7 +166,7 @@ with `_parent` field mapping created before version `2.0.0`. The data of these i
 
 The format of the join between parent and child documents have changed with the `2.0.0` release. The old
 format can't read from version `3.0.0` and onwards. The new format allows for a much more efficient and
-scalable join between parent and child documents and the join data structures are stored on on disk
+scalable join between parent and child documents and the join data structures are stored on disk
 data structures as opposed as before the join data structures were stored in the jvm heap space.
 
 ==== `score_type` has been removed

test/framework/src/main/java/org/elasticsearch/test/ESIntegTestCase.java

@@ -1435,11 +1435,8 @@ public void indexRandom(boolean forceRefresh, boolean dummyDocuments, boolean ma
         if (!bogusIds.isEmpty()) {
             // delete the bogus types again - it might trigger merges or at least holes in the segments and enforces deleted docs!
             for (Tuple<String, String> doc : bogusIds) {
-                // see https://github.com/elasticsearch/elasticsearch/issues/8706
-                final DeleteResponse deleteResponse = client().prepareDelete(doc.v1(), RANDOM_BOGUS_TYPE, doc.v2()).get();
-                if (deleteResponse.isFound() == false) {
-                    logger.warn("failed to delete a dummy doc [{}][{}]", doc.v1(), doc.v2());
-                }
+                assertTrue("failed to delete a dummy doc [" + doc.v1() + "][" + doc.v2() + "]",
+                    client().prepareDelete(doc.v1(), RANDOM_BOGUS_TYPE, doc.v2()).get().isFound());
             }
         }
         if (forceRefresh) {