diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc index d9d19bac..4d1aef54 100644 --- a/docs/src/main/asciidoc/_configprops.adoc +++ b/docs/src/main/asciidoc/_configprops.adoc @@ -3,13 +3,13 @@ |spring.cloud.consul.config.acl-token | | |spring.cloud.consul.config.data-key | `data` | If format is Format.PROPERTIES or Format.YAML then the following field is used as key to look up consul for configuration. -|spring.cloud.consul.config.default-context | `application` | -|spring.cloud.consul.config.enabled | `true` | +|spring.cloud.consul.config.default-context | `application` | +|spring.cloud.consul.config.enabled | `true` | |spring.cloud.consul.config.fail-fast | `true` | Throw exceptions during config lookup if true, otherwise, log warnings. |spring.cloud.consul.config.format | | |spring.cloud.consul.config.name | | Alternative to spring.application.name to use in looking up values in consul KV. -|spring.cloud.consul.config.prefix | `config` | -|spring.cloud.consul.config.profile-separator | `,` | +|spring.cloud.consul.config.prefix | `config` | +|spring.cloud.consul.config.profile-separator | `,` | |spring.cloud.consul.config.watch.delay | `1000` | The value of the fixed delay for the watch in millis. Defaults to 1000. |spring.cloud.consul.config.watch.enabled | `true` | If the watch is enabled. Defaults to true. |spring.cloud.consul.config.watch.wait-time | `55` | The number of seconds to wait (or block) for watch query, defaults to 55. Needs to be less than default ConsulClient (defaults to 60). To increase ConsulClient timeout create a ConsulClient bean with a custom ConsulRawClient with a custom HttpClient. @@ -31,17 +31,17 @@ |spring.cloud.consul.discovery.health-check-timeout | | Timeout for health check (e.g. 10s). |spring.cloud.consul.discovery.health-check-tls-skip-verify | | Skips certificate verification during service checks if true, otherwise runs certificate verification. |spring.cloud.consul.discovery.health-check-url | | Custom health check url to override default. -|spring.cloud.consul.discovery.heartbeat.enabled | `false` | +|spring.cloud.consul.discovery.heartbeat.enabled | `false` | |spring.cloud.consul.discovery.heartbeat.interval-ratio | | -|spring.cloud.consul.discovery.heartbeat.ttl-unit | `s` | -|spring.cloud.consul.discovery.heartbeat.ttl-value | `30` | +|spring.cloud.consul.discovery.heartbeat.ttl-unit | `s` | +|spring.cloud.consul.discovery.heartbeat.ttl-value | `30` | |spring.cloud.consul.discovery.hostname | | Hostname to use when accessing server. |spring.cloud.consul.discovery.include-hostname-in-instance-id | `false` | Whether hostname is included into the default instance id when registering service. |spring.cloud.consul.discovery.instance-group | | Service instance group. |spring.cloud.consul.discovery.instance-id | | Unique service instance id. |spring.cloud.consul.discovery.instance-zone | | Service instance zone. |spring.cloud.consul.discovery.ip-address | | IP address to use when accessing service (must also set preferIpAddress to use). -|spring.cloud.consul.discovery.lifecycle.enabled | `true` | +|spring.cloud.consul.discovery.lifecycle.enabled | `true` | |spring.cloud.consul.discovery.management-enable-tag-override | | Enable tag override for the registered management service. |spring.cloud.consul.discovery.management-metadata | | Metadata to use when registering management service. |spring.cloud.consul.discovery.management-port | | Port to register the management service under (defaults to management port). @@ -68,6 +68,7 @@ |spring.cloud.consul.retry.max-attempts | `6` | Maximum number of attempts. |spring.cloud.consul.retry.max-interval | `2000` | Maximum interval for backoff. |spring.cloud.consul.retry.multiplier | `1.1` | Multiplier for next interval. +|spring.cloud.consul.ribbon.enabled | `true` | Enables Consul and Ribbon integration. |spring.cloud.consul.scheme | | Consul agent scheme (HTTP/HTTPS). If there is no scheme in address - client will use HTTP. |spring.cloud.consul.service-registry.auto-registration.enabled | `true` | Enables Consul Service Registry Auto-registration. |spring.cloud.consul.service-registry.enabled | `true` | Enables Consul Service Registry functionality. @@ -77,4 +78,4 @@ |spring.cloud.consul.tls.key-store-password | | Password to an external keystore. |spring.cloud.consul.tls.key-store-path | | Path to an external keystore. -|=== +|=== \ No newline at end of file diff --git a/pom.xml b/pom.xml index 85bf342a..3d111473 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ org.springframework.cloud spring-cloud-build - 2.3.3.RELEASE + 2.3.4.RELEASE diff --git a/spring-cloud-consul-dependencies/pom.xml b/spring-cloud-consul-dependencies/pom.xml index 740f79a0..c8336250 100644 --- a/spring-cloud-consul-dependencies/pom.xml +++ b/spring-cloud-consul-dependencies/pom.xml @@ -6,7 +6,7 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.3.3.RELEASE + 2.3.4.RELEASE spring-cloud-consul-dependencies