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

This commit is contained in:
Ryan Baxter
2018-06-04 11:28:21 -04:00

View File

@@ -1105,9 +1105,9 @@ Sometimes you want the clients to decrypt the configuration locally,
instead of doing it in the server. In that case you can still have
/encrypt and /decrypt endpoints (if you provide the `encrypt.*`
configuration to locate a key), but you need to explicitly switch off
the decryption of outgoing properties using
`spring.cloud.config.server.encrypt.enabled=false`. If you don't care
about the endpoints, then it should work if you configure neither the
the decryption of outgoing properties by placing
`spring.cloud.config.server.encrypt.enabled=false` in `bootstrap.[yml|properties]`.
If you don't care about the endpoints, then it should work if you configure neither the
key nor the enabled flag.
== Serving Alternative Formats