Merge branch '1.5.x'

7f8ca64d · Stephane Nicoll · 5ebed451 · e85578cf · 7f8ca64d
Commit 7f8ca64d authored Nov 23, 2017 by Stephane Nicoll
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

LocalDevToolsAutoConfiguration.java ...evtools/autoconfigure/LocalDevToolsAutoConfiguration.java +1 -0

No files found.
--- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java
+++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java
@@ -98,6 +98,7 @@ public class LocalDevToolsAutoConfiguration {
 	/**
 	 * Local Restart Configuration.
 	 */
+	@Configuration
 	@ConditionalOnProperty(prefix = "spring.devtools.restart", name = "enabled", matchIfMissing = true)
 	static class RestartConfiguration {