Commit Graph

9226 Commits (547a3554dd95c1086deb84090b16fd11e02e3e6d)
 

Author SHA1 Message Date
Andy Wilkinson f0b235cbc5 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 0333416952 Update WelcomePageHandlerMapping to handle reqs with no Accept header
Closes gh-7138
8 years ago
Stephane Nicoll 92db3b4803 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 18c3d42f45 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll b1d2552ede Merge pull request #7137 from michael-simons:polish_application-properties-docs
* pr/7137:
  Add missing parentheses
8 years ago
Michael J. Simons e87cf937e1 Add missing parentheses
Closes gh-7137
8 years ago
Stephane Nicoll 98f14f2ee9 Polish documentation
Closes gh-2642
8 years ago
Stephane Nicoll 097c64a91b Merge branch '1.5.x' 8 years ago
Stephane Nicoll 0c9015fdb7 Merge pull request #6571 from herau:master
* pr/6571:
  Polish contribution
  Manage Tomcat queued connections
8 years ago
Stephane Nicoll ab2a2579c8 Polish contribution
Closes gh-6571
8 years ago
Aurélien Leboulanger 7efdb91641 Manage Tomcat queued connections
Adding two tomcat server properties:
- server.tomcat.accept-count
- server.tomcat.max-connections

Closes gh-6433
8 years ago
Stephane Nicoll 97774afebf Merge branch '1.5.x' 8 years ago
Stephane Nicoll d5b2f67b5f Merge pull request #6543 from vpavic:database-initializers
* pr/6543:
  Polish contribution
  Improve database initializers
8 years ago
Stephane Nicoll 3e1425ebed Polish contribution
Closes gh-6543
8 years ago
Vedran Pavic 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
8 years ago
Andy Wilkinson 5dfe801fd7 Merge branch '1.5.x' 8 years ago
Andy Wilkinson d2d911ba94 Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 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
8 years ago
Stephane Nicoll 0480a96166 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 98b30416ca Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 9861cb7e9c Expand the note regarding LiveReload
See gh-7080
8 years ago
Stephane Nicoll 3a86e26977 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 5435f03690 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll f2511cfa49 Merge pull request #7127 from herau:fix/spring-boot-docs-thymeleaf
* pr/7127:
  Fix typo
8 years ago
Aurélien Leboulanger 2c64661b58 Fix typo
Closes gh-7127
8 years ago
Stephane Nicoll 5a2eae5628 Merge branch '1.5.x' 8 years ago
Stephane Nicoll ed333a67b4 Expose Spring Data Rest RepositoryDetectionStrategy
Closes gh-7113
8 years ago
Stephane Nicoll 502daf06ab Merge branch '1.5.x' 8 years ago
Stephane Nicoll d57f3afdd3 Add XA datasource for Apache Derby
Closes gh-6823
8 years ago
Stephane Nicoll 640a77fcfa Merge branch '1.5.x' 8 years ago
Stephane Nicoll 02b0e3955c Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 4a34c35da3 Merge pull request #7120 from izeye:fix-string-format
* pr/7120:
  Fix String.format() usages
8 years ago
Johnny Lim 1c4c0c6119 Fix String.format() usages
Closes gh-7120
8 years ago
Andy Wilkinson cf038da083 Merge branch '1.5.x' 8 years ago
Andy Wilkinson 9b6fa1e8d7 Separate conditions that did and did not match in auto-config endpoint
Closes gh-7122
8 years ago
Stephane Nicoll daaa545d69 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 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
8 years ago
Andy Wilkinson c465fcefad Merge branch '1.5.x' 8 years ago
Andy Wilkinson 9b8f33df6d Merge branch '1.4.x' into 1.5.x 8 years ago
Andy Wilkinson 20a2db79bd Separate conditions that did and did not match in auto-config report
Closes gh-7098
8 years ago
Stephane Nicoll 7474b53020 Add reference to RestFB Messenger 8 years ago
Stephane Nicoll f6f07dd426 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 0fe0ad4cfb Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 668993c4bf Fix typo
Closes gh-7117
8 years ago
Stephane Nicoll b54566c0cd Merge branch '1.5.x' 8 years ago
Stephane Nicoll f82e91df39 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll cbb3418059 Merge pull request #7004 from master
* pr/7004:
  Polish contribution
  Allow configuration to specify randomly generated database name
8 years ago
Stephane Nicoll 03961e6692 Polish contribution
Closes gh-7004
8 years ago
Rob Fletcher 7fcb197092 Allow configuration to specify randomly generated database name
See gh-7004
8 years ago
Stephane Nicoll 89b1ff1fac Merge branch '1.5.x' 8 years ago