Merge branch '1.2.x'

2015-10-07 23:34:08 -07:00
parent 47576354f7 6ab376e2e8
commit e473364e4e
507 changed files with 2659 additions and 2478 deletions
--- a/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java
+++ b/spring-boot-samples/spring-boot-sample-web-method-security/src/main/java/sample/security/method/SampleMethodSecurityApplication.java
@@ -75,8 +75,8 @@ public class SampleMethodSecurityApplication extends WebMvcConfigurerAdapter {

 	@Order(Ordered.HIGHEST_PRECEDENCE)
 	@Configuration
-	protected static class AuthenticationSecurity extends
-			GlobalAuthenticationConfigurerAdapter {
+	protected static class AuthenticationSecurity
+			extends GlobalAuthenticationConfigurerAdapter {

 		@Override
 		public void init(AuthenticationManagerBuilder auth) throws Exception {