Merge branch 'master' into 2.0.x

2017-10-11 08:13:04 -04:00
parent ff00aa8eee ccf613c29c
commit ed409a6c9f
2 changed files with 9 additions and 5 deletions
--- a/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationTests.java
+++ b/spring-cloud-context/src/test/java/org/springframework/cloud/context/scope/refresh/RefreshScopeConfigurationTests.java
@@ -161,7 +161,8 @@ public class RefreshScopeConfigurationTests {
 		String message;

 		@RequestMapping("/")
-		public String hello() {
+		// Deliberately use package scope
+		String hello() {
 			return message;
 		}