Merge remote-tracking branch 'origin/4.0.x'

docs/modules/ROOT/pages/spring-cloud-netflix.adoc

@@ -292,7 +292,7 @@ The following example shows the dependencies you need to add:
 
 You need not use the raw Netflix `EurekaClient`.
 Also, it is usually more convenient to use it behind a wrapper of some sort.
-Spring Cloud has support for <<spring-cloud-feign, Feign>> (a REST client builder) and <<spring-cloud-ribbon, Spring `RestTemplate`>> through the logical Eureka service identifiers (VIPs) instead of physical URLs.
+Spring Cloud has support for <<spring-cloud-feign, Feign>> (a REST client builder) and https://docs.spring.io/spring-cloud-commons/reference/4.1/spring-cloud-commons/loadbalancer.html[Spring Cloud LoadBalancer] through the logical Eureka service identifiers (VIPs) instead of physical URLs.
 
 You can also use the `org.springframework.cloud.client.discovery.DiscoveryClient`, which provides a simple API (not specific to Netflix) for discovery clients, as shown in the following example:
 

spring-cloud-netflix-eureka-client/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -12,12 +12,6 @@
       "description": "Determines whether the EurekaClient instance can be refreshed or not(If disabled none of the Eureka client properties will be refreshable).",
       "type": "java.lang.Boolean"
     },
-    {
-      "defaultValue": true,
-      "name": "ribbon.eureka.enabled",
-      "description": "Enables the use of Eureka with Ribbon.",
-      "type": "java.lang.Boolean"
-    },
     {
       "defaultValue": false,
       "name": "eureka.client.webclient.enabled",

spring-cloud-netflix-eureka-client/src/test/resources/application.yml

@@ -1,9 +1,4 @@
-# for EurekaRibbonClientPropertyOverrideIntegrationTests
-foo3:
-  ribbon:
-    NFLoadBalancerPingClassName: com.netflix.loadbalancer.DummyPing
-    NIWSServerListClassName: com.netflix.loadbalancer.ConfigurationBasedServerList
-
+
 security:
   basic:
     enabled: false