Merge branch '2.1.x'

2019-06-04 02:08:00 -07:00
parent 2b51cf442e ccfbd03482
commit d306b31ce9
107 changed files with 130 additions and 112 deletions
--- a/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/resources/org/springframework/boot/configurationsample/incremental/BarProperties.snippet
+++ b/spring-boot-project/spring-boot-tools/spring-boot-configuration-processor/src/test/resources/org/springframework/boot/configurationsample/incremental/BarProperties.snippet
@@ -6,4 +6,4 @@

 	public void setExtra(String extra) {
 		this.extra = extra;
-	}
+	}