| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 slavisa-baeldung | e087fc921e | BAEL-315 - reformatting config classes | 2016-10-29 19:25:52 +02:00 |  | 
			
				
					| 
							
							
								 tschiman | 3e7760f047 | Modify formatting. | 2016-10-24 20:49:43 -06:00 |  | 
			
				
					| 
							
							
								 tschiman | bad9a35061 | Modify formatting. | 2016-10-24 20:40:06 -06:00 |  | 
			
				
					| 
							
							
								 Tim Schimandle | c7551758d8 | BAEL-315 Clean up some code formatting on the security configurations | 2016-10-18 21:33:03 -06:00 |  | 
			
				
					| 
							
							
								 Tim Schimandle | 2777df61a9 | BAEL-315 Adding spring session as mechanism for sharing authentication tokens created by the edge service. | 2016-10-18 21:33:02 -06:00 |  | 
			
				
					| 
							
							
								 Tim Schimandle | 2a7b598cf0 | BAEL-315 Adding spring session as mechanism for sharing authentication tokens created by the edge service. | 2016-10-18 21:32:58 -06:00 |  | 
			
				
					| 
							
							
								 Tim Schimandle | 72c4fd84d4 | BAEL-315 reducing the number of users to simplify the code. | 2016-10-18 21:32:56 -06:00 |  | 
			
				
					| 
							
							
								 Tim Schimandle | b7ec6f3e4c | BAEL-315 added security to config and dsicovery servers. | 2016-10-18 21:32:52 -06:00 |  | 
			
				
					| 
							
							
								 Tim Schimandle | 798e72a121 | BAEL-315 adding configuration for security on the config and discovery servers. | 2016-10-18 21:32:51 -06:00 |  | 
			
				
					| 
							
							
								 slavisa-baeldung | 25ea6ef7ee | BAEL-314 - renaming module | 2016-09-29 00:12:05 +02:00 |  |