tschiman 826c536d0d Merge remote-tracking branch 'upstream/master' ... # Conflicts: # pom.xml # spring-cloud/spring-cloud-bootstrap/config/src/main/java/com/baeldung/spring/cloud/bootstrap/config/SecurityConfig.java # 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/SecurityConfig.java # spring-cloud/spring-cloud-bootstrap/resource/src/main/java/com/baeldung/spring/cloud/bootstrap/resource/SecurityConfig.java		2016-11-05 10:06:53 -06:00
..
src/main	Merge remote-tracking branch 'upstream/master'	2016-11-05 10:06:53 -06:00
pom.xml	BAEL-315 Adding spring session as mechanism for sharing authentication tokens created by the edge service.	2016-10-18 21:32:58 -06:00