Tim Schimandle
1bb1a74b5f
Merge remote-tracking branch 'origin/master'
# Conflicts:
# spring-cloud/spring-cloud-bootstrap/application-config/discovery.properties
# spring-cloud/spring-cloud-bootstrap/application-config/gateway.properties
# spring-cloud/spring-cloud-bootstrap/application-config/resource.properties
# spring-cloud/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java
# spring-cloud/spring-cloud-bootstrap/discovery/pom.xml
# spring-cloud/spring-cloud-bootstrap/discovery/src/main/java/com/baeldung/spring/cloud/bootstrap/discovery/SecurityConfig.java
# spring-cloud/spring-cloud-bootstrap/gateway/src/main/java/com/baeldung/spring/cloud/bootstrap/gateway/GatewayApplication.java
# spring-cloud/spring-cloud-bootstrap/resource/src/main/resources/bootstrap.properties