Merge branch '2.1.x'

2019-04-02 15:58:59 -07:00
parent 04517495af eff2f92c48
commit 6bb5311984
36 changed files with 92 additions and 65 deletions
--- a/spring-boot-samples/spring-boot-sample-data-elasticsearch/src/main/java/sample/data/elasticsearch/Customer.java
+++ b/spring-boot-samples/spring-boot-sample-data-elasticsearch/src/main/java/sample/data/elasticsearch/Customer.java
@@ -19,7 +19,8 @@ package sample.data.elasticsearch;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.Document;

-@Document(indexName = "customer", type = "customer", shards = 1, replicas = 0, refreshInterval = "-1")
+@Document(indexName = "customer", type = "customer", shards = 1, replicas = 0,
+		refreshInterval = "-1")
 public class Customer {

 	@Id