Merge branch '2.0.x'

2018-05-04 16:31:46 -07:00
parent b18a456123 6de479fe6a
commit 42c053cf1b
127 changed files with 419 additions and 210 deletions
--- a/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/elasticsearch/jest/JestClientCustomizationExample.java
+++ b/spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/elasticsearch/jest/JestClientCustomizationExample.java
@@ -42,4 +42,5 @@ public class JestClientCustomizationExample {

 	}
 	// end::customizer[]
+
 }