Merge branch '2.0.x'

2018-10-05 18:38:50 -04:00
parent 0b39ee1819 b473aaee1c
commit 480ebcd149
11 changed files with 196 additions and 13 deletions
--- a/docs/src/main/asciidoc/spring-cloud-gateway.adoc
+++ b/docs/src/main/asciidoc/spring-cloud-gateway.adoc
@@ -976,6 +976,7 @@ spring:
          - cert2.pem
 ----

+If the Spring Cloud Gateway is not provisioned with trusted certificates the default trust store is used (which can be overriden with system property javax.net.ssl.trustStore.

 == Configuration