java-tutorials

History

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

2016-10-18 21:39:40 -06:00

application-config

BAEL-315 Setting the discovery service to register with itself to make poxying with zuul possible.

2016-10-18 21:38:18 -06:00

config

BAEL-315 Clean up some code formatting on the security configurations

2016-10-18 21:33:03 -06:00

discovery

BAEL-315 Clean up some code formatting on the security configurations

2016-10-18 21:33:03 -06:00

gateway

Merge remote-tracking branch 'origin/master'