Merge branch 'master' into enhancement/remove_node_client_setting

core/src/test/java/org/elasticsearch/indices/mapping/UpdateMappingIntegrationIT.java

@@ -66,6 +66,7 @@ public class UpdateMappingIntegrationIT extends ESIntegTestCase {
                         settingsBuilder()
                                 .put("index.number_of_shards", 1)
                                 .put("index.number_of_replicas", 0)
+                                .put(MapperService.INDEX_MAPPING_TOTAL_FIELDS_LIMIT_SETTING.getKey(), Long.MAX_VALUE)
                 ).execute().actionGet();
         client().admin().cluster().prepareHealth().setWaitForEvents(Priority.LANGUID).setWaitForGreenStatus().execute().actionGet();
 

docs/reference/migration/migrate_5_0/settings.asciidoc

@@ -219,8 +219,8 @@ name of the setting must be prefixed with `es.`.
 
 ==== Discovery Settings
 
-The `discovery.zen.minimum_master_node` must bet set for nodes that are bound
-to a non-loopback network interface. We see those nodes as in "production" mode and
-thus require the setting.
-
-
+The `discovery.zen.minimum_master_node` must bet set for nodes that have
+`network.host`, `network.bind_host`, `network.publish_host`,
+`transport.host`, `transport.bind_host`, or `transport.publish_host`
+configuration options set. We see those nodes as in "production" mode
+and thus require the setting.