Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Phillip Webb
2016-12-27 15:06:22 -08:00
parent 7cf08be353 85504e74a6
commit 49fa702708
46 changed files with 313 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc
View File

@@ -1043,7 +1043,7 @@ is set. The client component must be launched manually.
==== Running the remote client application
The remote client application is designed to be run from within you IDE. You need to run
The remote client application is designed to be run from within your IDE. You need to run
`org.springframework.boot.devtools.RemoteSpringApplication` using the same classpath as
the remote project that you're connecting to. The _non-option_ argument passed to the
application should be the remote URL that you are connecting to.

4
spring-boot-docs/src/main/java/org/springframework/boot/elasticsearch/jest/JestClientCustomizationExample.java
View File

@@ -37,9 +37,9 @@ public class JestClientCustomizationExample {
@Override
public void customize(HttpClientConfig.Builder builder) {
builder.maxTotalConnection(100)
.defaultMaxTotalConnectionPerRoute(5);
builder.maxTotalConnection(100).defaultMaxTotalConnectionPerRoute(5);
}
}
// end::customizer[]
}