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,100 Commits 24 Branches 372 Tags 284 MiB
Commit Graph

9100 Commits

Author SHA1 Message Date
Stephane Nicoll d5c3a8ac76 Merge branch '1.5.x' 2016-10-12 10:30:37 +02:00
Stephane Nicoll c6f23000be Merge branch '1.4.x' into 1.5.x 2016-10-12 10:30:19 +02:00
Stephane Nicoll 11cad9e0cb Fix sample in ref doc 
Closes gh-7142
 2016-10-12 10:27:51 +02:00
Stephane Nicoll b0cbe1fdc7 Merge branch '1.5.x' 2016-10-12 10:04:15 +02:00
Stephane Nicoll f254e1227f Merge branch '1.4.x' into 1.5.x 2016-10-12 10:03:59 +02:00
Stephane Nicoll 0d3318796e Merge branch '1.3.x' into 1.4.x 2016-10-12 10:03:41 +02:00
Stephane Nicoll bd2956c3f0 Fix `metricsFilter` reference in doc 
Closes gh-7147
 2016-10-12 10:03:23 +02: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 264d8442da Fix build 2016-10-11 18:33:54 +02:00
Stephane Nicoll c5cc626d48 Remove remote shell support 
See gh-7044
 2016-10-11 17:59:25 +02:00
Stephane Nicoll 66a3df454f Merge branch '1.5.x' 2016-10-11 17:42:53 +02:00
Stephane Nicoll cfee9bab81 Deprecate remote shell support 
Closes gh-7044
 2016-10-11 17:39:28 +02:00
Stephane Nicoll 7f2806bd19 Merge branch '1.5.x' 2016-10-11 17:06:04 +02:00
Stephane Nicoll 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
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
Stephane Nicoll c50a352999 Merge branch '1.5.x' 2016-10-11 15:37:07 +02:00
Stephane Nicoll 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
Stephane Nicoll 28ed59ca6e Polish contribution 
Closes gh-6645
 2016-10-11 15:36:35 +02:00
Plamen Totev 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
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 92db3b4803 Merge branch '1.5.x' 2016-10-11 08:33:46 +02:00
Stephane Nicoll 18c3d42f45 Merge branch '1.4.x' into 1.5.x 2016-10-11 08:32:43 +02:00
Stephane Nicoll 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
Michael J. Simons e87cf937e1 Add missing parentheses 
Closes gh-7137
 2016-10-11 08:31:44 +02:00
Stephane Nicoll 98f14f2ee9 Polish documentation 
Closes gh-2642
 2016-10-11 08:30:18 +02:00
Stephane Nicoll 097c64a91b Merge branch '1.5.x' 2016-10-10 11:37:51 +02:00
Stephane Nicoll 0c9015fdb7 Merge pull request #6571 from herau:master 
* pr/6571:
  Polish contribution
  Manage Tomcat queued connections
 2016-10-10 11:37:38 +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 d5b2f67b5f Merge pull request #6543 from vpavic:database-initializers 
* pr/6543:
  Polish contribution
  Improve database initializers
 2016-10-10 10:43:29 +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
Andy Wilkinson 5dfe801fd7 Merge branch '1.5.x' 2016-10-07 17:08:30 +01:00
Andy Wilkinson d2d911ba94 Merge branch '1.4.x' into 1.5.x 2016-10-07 17:08:20 +01:00
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
 2016-10-07 17:07:44 +01:00
Stephane Nicoll 0480a96166 Merge branch '1.5.x' 2016-10-07 14:21:40 +02:00
Stephane Nicoll 98b30416ca Merge branch '1.4.x' into 1.5.x 2016-10-07 14:21:28 +02:00
Stephane Nicoll 9861cb7e9c Expand the note regarding LiveReload 
See gh-7080
 2016-10-07 14:21:12 +02:00
Stephane Nicoll 3a86e26977 Merge branch '1.5.x' 2016-10-07 14:15:31 +02:00
Stephane Nicoll 5435f03690 Merge branch '1.4.x' into 1.5.x 2016-10-07 14:15:19 +02:00
Stephane Nicoll f2511cfa49 Merge pull request #7127 from herau:fix/spring-boot-docs-thymeleaf 
* pr/7127:
  Fix typo
 2016-10-07 14:15:04 +02:00
Aurélien Leboulanger 2c64661b58 Fix typo 
Closes gh-7127
 2016-10-07 14:14:50 +02:00
Stephane Nicoll 5a2eae5628 Merge branch '1.5.x' 2016-10-07 10:35:59 +02:00