f254e1227f
Merge branch '1.4.x' into 1.5.x
2016-10-12 10:03:59 +02:00
0d3318796e
Merge branch '1.3.x' into 1.4.x
2016-10-12 10:03:41 +02:00
bd2956c3f0
Fix `metricsFilter` reference in doc
...
Closes gh-7147
2016-10-12 10:03:23 +02:00
d818a09ed8
Polish
2016-10-11 23:38:14 -07:00
d3e06c4627
Merge branch '1.4.x' into 1.5.x
2016-10-11 21:46:06 -07:00
db3f488d5a
Polish
2016-10-11 17:54:00 -07:00
cfee9bab81
Deprecate remote shell support
...
Closes gh-7044
2016-10-11 17:39:28 +02:00
5976d44f6c
Merge pull request #6666 from maciejwalkowiak:spring-amqp-idle-event-interval-property
...
* pr/6666:
Polish contribution
Add Rabbit idleEventInterval property
2016-10-11 17:03:59 +02:00
6fb53f90e5
Polish contribution
...
Closes gh-6666
2016-10-11 17:03:10 +02:00
47ec8630c8
Add Rabbit idleEventInterval property
...
This commit adds a property to configure how often idle container events
should be published.
See gh-6666
2016-10-11 15:49:10 +02:00
ea3deae010
Merge pull request #6645 from plamentotev:maven-run-work-dir
...
* pr/6645:
Polish contribution
Add workingDirectory option for Maven plugin run/start
2016-10-11 15:36:51 +02:00
28ed59ca6e
Polish contribution
...
Closes gh-6645
2016-10-11 15:36:35 +02:00
3cccc732df
Add workingDirectory option for Maven plugin run/start
...
Add configuration option that specifies the working directory to use to
run/start the application via the Maven plugin.
Closes gh-6243
2016-10-11 15:36:27 +02:00
f0b235cbc5
Merge branch '1.4.x' into 1.5.x
2016-10-11 13:04:59 +01:00
0333416952
Update WelcomePageHandlerMapping to handle reqs with no Accept header
...
Closes gh-7138
2016-10-11 13:02:36 +01:00
18c3d42f45
Merge branch '1.4.x' into 1.5.x
2016-10-11 08:32:43 +02:00
b1d2552ede
Merge pull request #7137 from michael-simons:polish_application-properties-docs
...
* pr/7137:
Add missing parentheses
2016-10-11 08:31:59 +02:00
e87cf937e1
Add missing parentheses
...
Closes gh-7137
2016-10-11 08:31:44 +02:00
98f14f2ee9
Polish documentation
...
Closes gh-2642
2016-10-11 08:30:18 +02:00
0c9015fdb7
Merge pull request #6571 from herau:master
...
* pr/6571:
Polish contribution
Manage Tomcat queued connections
2016-10-10 11:37:38 +02:00
ab2a2579c8
Polish contribution
...
Closes gh-6571
2016-10-10 11:37:21 +02:00
7efdb91641
Manage Tomcat queued connections
...
Adding two tomcat server properties:
- server.tomcat.accept-count
- server.tomcat.max-connections
Closes gh-6433
2016-10-10 11:37:12 +02:00
d5b2f67b5f
Merge pull request #6543 from vpavic:database-initializers
...
* pr/6543:
Polish contribution
Improve database initializers
2016-10-10 10:43:29 +02:00
3e1425ebed
Polish contribution
...
Closes gh-6543
2016-10-10 10:43:12 +02:00
286a928347
Improve database initializers
...
This commit improves database initializers for Spring Batch and Spring
Session by introducing `AbstractDatabaseInitializer` which eliminates
duplicated logic in existing initializers. Additionally, database
platform resolution now relies on `DatabaseDriver`.
See gh-6543
2016-10-10 09:53:40 +02:00
d2d911ba94
Merge branch '1.4.x' into 1.5.x
2016-10-07 17:08:20 +01:00
a5b4c8e6db
Make cycle clearer in bean currently in creation failure analysis
...
Note: the fully-qualified references to @Configuration in some of the
test configuration classes are required to work around a bug in javac.
1.8.0_102 (and earlier). Without them, compilation fails as it cannot
resolve the symbol despite the import statement and the unqualified
references working elsewhere in the same source file.
Closes gh-7056
2016-10-07 17:07:44 +01:00
98b30416ca
Merge branch '1.4.x' into 1.5.x
2016-10-07 14:21:28 +02:00
9861cb7e9c
Expand the note regarding LiveReload
...
See gh-7080
2016-10-07 14:21:12 +02:00
5435f03690
Merge branch '1.4.x' into 1.5.x
2016-10-07 14:15:19 +02:00
f2511cfa49
Merge pull request #7127 from herau:fix/spring-boot-docs-thymeleaf
...
* pr/7127:
Fix typo
2016-10-07 14:15:04 +02:00
2c64661b58
Fix typo
...
Closes gh-7127
2016-10-07 14:14:50 +02:00
ed333a67b4
Expose Spring Data Rest RepositoryDetectionStrategy
...
Closes gh-7113
2016-10-07 10:35:48 +02:00
d57f3afdd3
Add XA datasource for Apache Derby
...
Closes gh-6823
2016-10-07 10:23:13 +02:00
02b0e3955c
Merge branch '1.4.x' into 1.5.x
2016-10-07 09:46:21 +02:00
4a34c35da3
Merge pull request #7120 from izeye:fix-string-format
...
* pr/7120:
Fix String.format() usages
2016-10-07 09:46:03 +02:00
1c4c0c6119
Fix String.format() usages
...
Closes gh-7120
2016-10-07 09:45:43 +02:00
9b6fa1e8d7
Separate conditions that did and did not match in auto-config endpoint
...
Closes gh-7122
2016-10-06 17:15:38 +01:00
c06dc33bf6
Generate deprecated meta-data for deprecated @Bean methods
...
This commit makes sure that a meta-data group exposed via a deprecated
`@Bean` method is deprecated as well. This also works if the class
in which the bean method is defined is itself deprecated.
Closes gh-7100
2016-10-06 17:08:49 +02:00
9b8f33df6d
Merge branch '1.4.x' into 1.5.x
2016-10-06 15:53:07 +01:00
20a2db79bd
Separate conditions that did and did not match in auto-config report
...
Closes gh-7098
2016-10-06 15:52:45 +01:00
0fe0ad4cfb
Merge branch '1.4.x' into 1.5.x
2016-10-06 13:35:32 +02:00
668993c4bf
Fix typo
...
Closes gh-7117
2016-10-06 13:35:21 +02:00
f82e91df39
Merge branch '1.4.x' into 1.5.x
2016-10-06 13:29:53 +02:00
cbb3418059
Merge pull request #7004 from master
...
* pr/7004:
Polish contribution
Allow configuration to specify randomly generated database name
2016-10-06 13:29:38 +02:00
03961e6692
Polish contribution
...
Closes gh-7004
2016-10-06 13:28:23 +02:00
7fcb197092
Allow configuration to specify randomly generated database name
...
See gh-7004
2016-10-06 11:40:19 +02:00
f684bcc9e5
Merge branch '1.4.x' into 1.5.x
2016-10-06 11:37:20 +02:00
0f97ccf2fa
Clarify dependency override instructions for Thymeleaf 3
...
Closes gh-7097
2016-10-06 11:21:24 +02:00
200e246238
Merge branch '1.4.x' into 1.5.x
2016-10-06 09:35:01 +02:00
Stephane Nicoll
Phillip Webb
Maciej Walkowiak
Plamen Totev
Andy Wilkinson
Michael J. Simons
Aurélien Leboulanger
Vedran Pavic
Johnny Lim
Rob Fletcher