Phillip Webb
277d01ab53
Merge branch '1.5.x'
8 years ago
Madhura Bhave
90722a9bca
Add @ConditionalOnCloudPlatform
...
Add a @ConditionalOnCloudPlatform annotation that matches based on the
active ClouldPlatform.
Fixes gh-7155
8 years ago
Phillip Webb
01900c8342
Merge branch '1.5.x'
8 years ago
Phillip Webb
d818a09ed8
Polish
8 years ago
Phillip Webb
d3e06c4627
Merge branch '1.4.x' into 1.5.x
8 years ago
Phillip Webb
db3f488d5a
Polish
8 years ago
Stephane Nicoll
7f2806bd19
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
6fb53f90e5
Polish contribution
...
Closes gh-6666
8 years ago
Maciej Walkowiak
47ec8630c8
Add Rabbit idleEventInterval property
...
This commit adds a property to configure how often idle container events
should be published.
See gh-6666
8 years ago
Andy Wilkinson
58770e0c73
Merge branch '1.5.x'
8 years ago
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
097c64a91b
Merge branch '1.5.x'
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
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
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
640a77fcfa
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
02b0e3955c
Merge branch '1.4.x' into 1.5.x
8 years ago
Johnny Lim
1c4c0c6119
Fix String.format() usages
...
Closes gh-7120
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
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
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
2ff41ce9cc
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
200e246238
Merge branch '1.4.x' into 1.5.x
8 years ago
Johnny Lim
91254f2110
Remove unused parameters in String.format()
...
Closes gh-7111
8 years ago
Stephane Nicoll
8b61d15120
Remove deprecated support for commons-dbcp 1
...
See gh-6787
8 years ago
Stephane Nicoll
543498f040
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
cf28663cd7
Deprecate commons-dbcp 1
...
Closes gh-6787
8 years ago
Stephane Nicoll
0d5985b8dd
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
07690bab25
Allow customization of the auto-configured JmsTemplate
...
Closes gh-6825
8 years ago
Phillip Webb
53f50eda39
Merge branch '1.5.x'
8 years ago
Phillip Webb
a2315378d4
Formatting
8 years ago
Phillip Webb
f2b0fa284e
Merge branch '1.4.x' into 1.5.x
8 years ago
Phillip Webb
3326841a97
Formatting
8 years ago
Phillip Webb
39ed0d4dfb
Polish
8 years ago
Stephane Nicoll
f181421f67
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
8ad477537e
Fail fast if both uri and client attributes are set
...
Previously, an URI and individual client attributes can be set to
configure the mongo client. In such a scenario, the URI is ignored.
This commit changes the URI to be "null" and the creation of the client
to fail if both the uri and client attributes are set. If no client
attributes are set, the uri is used as before.
Closes gh-6739
8 years ago
Stephane Nicoll
b95b57dbf5
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
e643fc5bd1
Merge branch '1.4.x' into 1.5.x
8 years ago
Johnny Lim
503d735fdd
Polish
...
Closes gh-7081
8 years ago
Stephane Nicoll
8f96278ce9
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
7ffa499949
Merge branch '1.4.x' into 1.5.x
8 years ago