Merge branch '1.5.x'

2017-01-26 15:05:02 +00:00
parent f65fe4826f f34d309548
commit bed727ae8c
9 changed files with 19 additions and 18 deletions
--- a/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/main/java/sample/metrics/opentsdb/SampleController.java
+++ b/spring-boot-samples/spring-boot-sample-metrics-opentsdb/src/main/java/sample/metrics/opentsdb/SampleController.java
@@ -39,8 +39,8 @@ public class SampleController {
 	@GetMapping("/")
 	@ResponseBody
 	public Map<String, String> hello() {
-		return Collections.singletonMap("message", "Hello " +
-				this.helloWorldProperties.getName());
+		return Collections.singletonMap("message",
+				"Hello " + this.helloWorldProperties.getName());
 	}

 	protected static class Message {