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

Merge branch '1.5.x'

Browse Source
pull/9438/merge
Stephane Nicoll 8 years ago
parent 7ae9477bd3 61eda3e6b0
commit fe3e1cf1d3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

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

@ -639,7 +639,7 @@ content into your application; rather pick only the properties that you need.
# DATA REDIS # DATA REDIS
spring.data.redis.repositories.enabled=true # Enable Redis repositories. spring.data.redis.repositories.enabled=true # Enable Redis repositories.
# NEO4J ({sc-spring-boot-autoconfigure}/neo4j/Neo4jProperties.{sc-ext}[Neo4jProperties]) # NEO4J ({sc-spring-boot-autoconfigure}/data/neo4j/Neo4jProperties.{sc-ext}[Neo4jProperties])
spring.data.neo4j.auto-index=none # Auto index mode. spring.data.neo4j.auto-index=none # Auto index mode.
spring.data.neo4j.embedded.enabled=true # Enable embedded mode if the embedded driver is available. spring.data.neo4j.embedded.enabled=true # Enable embedded mode if the embedded driver is available.
spring.data.neo4j.open-in-view=false # Register OpenSessionInViewInterceptor. Binds a Neo4j Session to the thread for the entire processing of the request. spring.data.neo4j.open-in-view=false # Register OpenSessionInViewInterceptor. Binds a Neo4j Session to the thread for the entire processing of the request.
@ -698,7 +698,7 @@ content into your application; rather pick only the properties that you need.
spring.datasource.xa.data-source-class-name= # XA datasource fully qualified name. spring.datasource.xa.data-source-class-name= # XA datasource fully qualified name.
spring.datasource.xa.properties= # Properties to pass to the XA data source. spring.datasource.xa.properties= # Properties to pass to the XA data source.
# JEST (Elasticsearch HTTP client) ({sc-spring-boot-autoconfigure}/jest/JestProperties.{sc-ext}[JestProperties]) # JEST (Elasticsearch HTTP client) ({sc-spring-boot-autoconfigure}/elasticsearch/jest/JestProperties.{sc-ext}[JestProperties])
spring.elasticsearch.jest.connection-timeout=3000 # Connection timeout in milliseconds. spring.elasticsearch.jest.connection-timeout=3000 # Connection timeout in milliseconds.
spring.elasticsearch.jest.multi-threaded=true # Enable connection requests from multiple execution threads. spring.elasticsearch.jest.multi-threaded=true # Enable connection requests from multiple execution threads.
spring.elasticsearch.jest.password= # Login password. spring.elasticsearch.jest.password= # Login password.

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

@ -451,7 +451,7 @@ WARNING: Fully executable jars work by embedding an extra script at the front of
file. Currently, some tools do not accept this format so you may not always be able to file. Currently, some tools do not accept this format so you may not always be able to
use this technique. For example, `jar -xf` may silently fail to extract a jar or war that use this technique. For example, `jar -xf` may silently fail to extract a jar or war that
has been made fully-executable. It is recommended that you only make your jar or war has been made fully-executable. It is recommended that you only make your jar or war
fully executable if you intened to execute it directly, rather than running it with fully executable if you intend to execute it directly, rather than running it with
`java -jar` or deploying it to a servlet container. `java -jar` or deploying it to a servlet container.
To create a '`fully executable`' jar with Maven use the following plugin configuration: To create a '`fully executable`' jar with Maven use the following plugin configuration:

Write Preview
Loading…
Cancel
Save