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

This commit is contained in:
Ryan Baxter
2018-06-04 14:17:33 -04:00

View File

@@ -263,6 +263,14 @@ public class MyConfiguration {
Each `ServiceRegistry` implementation has its own `Registry` implementation.
* `ZookeeperRegistration` used with `ZookeeperServiceRegistry`
* `EurekaRegistration` used with `EurekaServiceRegistry`
* `ConsulRegistration` used with `ConsulServiceRegistry`
If you are using the `ServiceRegistry` interface, you are going to need to pass the
correct `Registry` implementation for the `ServiceRegistry` implementation you
are using.
==== ServiceRegistry Auto-Registration
@@ -503,7 +511,7 @@ spring:
You can also force the use of only specified network addresses by using a list of regular expressions, as shown in the following example:
.application.yml
.bootstrap.yml
----
spring:
cloud: