root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
9,137 Commits 24 Branches 369 Tags 282 MiB
Commit Graph

2094 Commits

Author SHA1 Message Date
Andy Wilkinson 7c870ea4fb Merge branch '1.5.x' 2016-10-13 12:30:16 +01:00
Andy Wilkinson 29d4a01b30 Merge branch '1.4.x' into 1.5.x 2016-10-13 12:30:05 +01:00
Andy Wilkinson 7968c6b548 Assign on order to OnPropertyCondition 
Closes gh-7144
 2016-10-13 12:29:35 +01:00
Andy Wilkinson cc04621dc2 Assign an order to OnResourceCondition 
Closes gh-7145
 2016-10-13 12:27:47 +01:00
Phillip Webb 277d01ab53 Merge branch '1.5.x' 2016-10-12 13:35:21 -07:00
Madhura Bhave 90722a9bca Add @ConditionalOnCloudPlatform 
Add a @ConditionalOnCloudPlatform annotation that matches based on the
active ClouldPlatform.

Fixes gh-7155
 2016-10-12 13:32:37 -07:00
Phillip Webb 01900c8342 Merge branch '1.5.x' 2016-10-11 23:42:14 -07:00
Phillip Webb d818a09ed8 Polish 2016-10-11 23:38:14 -07:00
Phillip Webb d3e06c4627 Merge branch '1.4.x' into 1.5.x 2016-10-11 21:46:06 -07:00
Phillip Webb db3f488d5a Polish 2016-10-11 17:54:00 -07:00
Stephane Nicoll 7f2806bd19 Merge branch '1.5.x' 2016-10-11 17:06:04 +02:00
Stephane Nicoll 6fb53f90e5 Polish contribution 
Closes gh-6666
 2016-10-11 17:03:10 +02:00
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
 2016-10-11 15:49:10 +02:00
Andy Wilkinson 58770e0c73 Merge branch '1.5.x' 2016-10-11 13:05:10 +01:00
Andy Wilkinson f0b235cbc5 Merge branch '1.4.x' into 1.5.x 2016-10-11 13:04:59 +01:00
Andy Wilkinson 0333416952 Update WelcomePageHandlerMapping to handle reqs with no Accept header 
Closes gh-7138
 2016-10-11 13:02:36 +01:00
Stephane Nicoll 097c64a91b Merge branch '1.5.x' 2016-10-10 11:37:51 +02:00
Stephane Nicoll ab2a2579c8 Polish contribution 
Closes gh-6571
 2016-10-10 11:37:21 +02:00
Aurélien Leboulanger 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
Stephane Nicoll 97774afebf Merge branch '1.5.x' 2016-10-10 10:43:40 +02:00
Stephane Nicoll 3e1425ebed Polish contribution 
Closes gh-6543
 2016-10-10 10:43:12 +02:00
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
 2016-10-10 09:53:40 +02:00
Stephane Nicoll 5a2eae5628 Merge branch '1.5.x' 2016-10-07 10:35:59 +02:00
Stephane Nicoll ed333a67b4 Expose Spring Data Rest RepositoryDetectionStrategy 
Closes gh-7113
 2016-10-07 10:35:48 +02:00
Stephane Nicoll 640a77fcfa Merge branch '1.5.x' 2016-10-07 09:46:39 +02:00
Stephane Nicoll 02b0e3955c Merge branch '1.4.x' into 1.5.x 2016-10-07 09:46:21 +02:00
Johnny Lim 1c4c0c6119 Fix String.format() usages 
Closes gh-7120
 2016-10-07 09:45:43 +02:00
Andy Wilkinson c465fcefad Merge branch '1.5.x' 2016-10-06 15:53:19 +01:00
Andy Wilkinson 9b8f33df6d Merge branch '1.4.x' into 1.5.x 2016-10-06 15:53:07 +01:00
Andy Wilkinson 20a2db79bd Separate conditions that did and did not match in auto-config report 
Closes gh-7098
 2016-10-06 15:52:45 +01:00
Stephane Nicoll b54566c0cd Merge branch '1.5.x' 2016-10-06 13:30:14 +02:00
Stephane Nicoll f82e91df39 Merge branch '1.4.x' into 1.5.x 2016-10-06 13:29:53 +02:00
Stephane Nicoll 03961e6692 Polish contribution 
Closes gh-7004
 2016-10-06 13:28:23 +02:00
Rob Fletcher 7fcb197092 Allow configuration to specify randomly generated database name 
See gh-7004
 2016-10-06 11:40:19 +02:00
Stephane Nicoll 2ff41ce9cc Merge branch '1.5.x' 2016-10-06 09:35:15 +02:00
Stephane Nicoll 200e246238 Merge branch '1.4.x' into 1.5.x 2016-10-06 09:35:01 +02:00
Johnny Lim 91254f2110 Remove unused parameters in String.format() 
Closes gh-7111
 2016-10-06 09:34:32 +02:00
Stephane Nicoll 8b61d15120 Remove deprecated support for commons-dbcp 1 
See gh-6787
 2016-10-05 15:51:14 +02:00
Stephane Nicoll 543498f040 Merge branch '1.5.x' 2016-10-05 15:21:23 +02:00
Stephane Nicoll cf28663cd7 Deprecate commons-dbcp 1 
Closes gh-6787
 2016-10-05 15:21:09 +02:00
Stephane Nicoll 0d5985b8dd Merge branch '1.5.x' 2016-10-04 15:01:04 +02:00
Stephane Nicoll 07690bab25 Allow customization of the auto-configured JmsTemplate 
Closes gh-6825
 2016-10-04 15:00:42 +02:00
Phillip Webb 53f50eda39 Merge branch '1.5.x' 2016-10-03 22:47:11 -07:00
Phillip Webb a2315378d4 Formatting 2016-10-03 22:44:36 -07:00
Phillip Webb f2b0fa284e Merge branch '1.4.x' into 1.5.x 2016-10-03 22:38:22 -07:00
Phillip Webb 3326841a97 Formatting 2016-10-03 22:19:35 -07:00
Phillip Webb 39ed0d4dfb Polish 2016-10-03 21:58:13 -07:00
Stephane Nicoll f181421f67 Merge branch '1.5.x' 2016-10-03 11:29:56 +02:00
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
 2016-10-03 11:29:20 +02:00
Stephane Nicoll b95b57dbf5 Merge branch '1.5.x' 2016-10-02 11:08:53 +02:00