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:
Andy Wilkinson
2017-08-03 21:23:20 +01:00
parent 09b41a33e8 1f37da5b06
commit 5c06bd5ab9
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -444,7 +444,7 @@ then use the https://cloud.google.com/sdk/downloads[Google Cloud SDK] to push yo
Spring Boot app into that slot from the command line or CI build.
App Engine needs you to create an `app.yaml` file to describe the resources your app
requires. Normally you put this in `src/min/appengine`, and it looks something like this:
requires. Normally you put this in `src/main/appengine`, and it looks something like this:
[source,yaml,indent=0]
----

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

@@ -804,7 +804,7 @@ rewriting classes as they are loaded to make them more amenable to reloading.
==== Excluding resources
Certain resources don't necessarily need to trigger a restart when they are changed. For
example, Thymeleaf templates can just be edited in-place. By default changing resources
in `/META-INF/maven`, `/META-INF/resources` ,`/resources` ,`/static` ,`/public` or
in `/META-INF/maven`, `/META-INF/resources`, `/resources`, `/static`, `/public` or
`/templates` will not trigger a restart but will trigger a
<<using-boot-devtools-livereload, live reload>>. If you want to customize these exclusions
you can use the `spring.devtools.restart.exclude` property. For example, to exclude only