fuhouyin/spring-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll 2017-06-22 09:31:04 +02:00
commit beb72ca8ee
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java
View File

@ -161,7 +161,7 @@ public class LiquibaseAutoConfiguration {
}
/**
* A custom {@link SpringLiquibase} extension that close the underlying
* A custom {@link SpringLiquibase} extension that closes the underlying
* {@link DataSource} once the database has been migrated.
*/
private static final class DataSourceClosingSpringLiquibase extends SpringLiquibase {

4
spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
View File

@ -140,8 +140,8 @@ content into your application; rather pick only the properties that you need.
# SENDGRID ({sc-spring-boot-autoconfigure}/sendgrid/SendGridAutoConfiguration.{sc-ext}[SendGridAutoConfiguration])
spring.sendgrid.api-key= # SendGrid api key (alternative to username/password)
spring.sendgrid.proxy.host= # SendGrid proxy host
spring.sendgrid.proxy.port= # SendGrid proxy port
spring.sendgrid.proxy.host= # SendGrid proxy host.
spring.sendgrid.proxy.port= # SendGrid proxy port.
# ----------------------------------------

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

@ -2318,7 +2318,7 @@ for other Groovy customization options.
[[howto-reload-fast-restart]]
=== Fast application restarts
The `spring-boot-devtools` module includes support for automatic application restarts.
Whilst not as fast a technologies such as http://zeroturnaround.com/software/jrebel/[JRebel]
Whilst not as fast as technologies such as http://zeroturnaround.com/software/jrebel/[JRebel]
it's usually significantly faster than a "`cold start`". You should probably give it a try
before investigating some of the more complex reload options discussed below.

4
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@ -5149,8 +5149,8 @@ provide good examples of how to write XA wrappers.
[[boot-features-hazelcast]]
== Hazelcast
If hazelcast is on the classpath and a suitable configuration is found, Spring Boot
will auto-configure an `HazelcastInstance` that you can inject in your application.
If Hazelcast is on the classpath and a suitable configuration is found, Spring Boot
will auto-configure a `HazelcastInstance` that you can inject in your application.
You can define a `com.hazelcast.config.Config` bean and we'll use that. If your
configuration defines an instance name, we'll try to locate an existing instance rather