Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,211 Commits 23 Branches 0 Tags
73b5afa56ef0cdfed7fa5cfa2af4ae86a9aa6ecb
Commit Graph

9211 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
73b5afa56e Merge branch '1.5.x' 2016-10-24 18:08:39 +02:00
Stephane Nicoll
ae4dd0d17e Merge branch '1.4.x' into 1.5.x 2016-10-24 18:08:23 +02:00
Stephane Nicoll
a638dcd51b Remove unnecessary use of System.out.println 2016-10-24 18:07:40 +02:00
Andy Wilkinson
7be16c7b54 Merge branch '1.5.x' 2016-10-24 14:37:25 +01:00
Andy Wilkinson
a56bf44b39 Merge branch '1.4.x' into 1.5.x 2016-10-24 14:37:20 +01:00
Andy Wilkinson
8150cbd0d1 Remove commentary on Neo4j's licence 
Closes gh-7214
 2016-10-24 14:36:35 +01:00
Andy Wilkinson
475c5f1ae5 Merge branch '1.5.x' 2016-10-24 14:11:58 +01:00
Andy Wilkinson
92462a06ad Merge branch '1.4.x' into 1.5.x 2016-10-24 14:11:25 +01:00
Andy Wilkinson
2b46a4876f Start building against Spring Framework 4.3.4 snapshots 
Closes gh-7174
See gh-7213
 2016-10-24 14:10:12 +01:00
Andy Wilkinson
3f655d998d Merge branch '1.5.x' 2016-10-24 12:20:41 +01:00
Andy Wilkinson
9abafb839b Merge branch '1.4.x' into 1.5.x 2016-10-24 12:20:23 +01:00
Andy Wilkinson
be597d7ce9 Fix handling of cyrillic characters in AsciiBytes hashCode method 
Closes gh-7202
 2016-10-24 12:19:57 +01:00
Stephane Nicoll
e509278580 Merge branch '1.5.x' 2016-10-24 11:39:38 +02:00
Stephane Nicoll
eddb10e4c9 Merge branch '1.4.x' into 1.5.x 2016-10-24 11:39:26 +02:00
Stephane Nicoll
713fd51f9c Merge pull request #6954 from vpavic:update-docs 
* pr/6954:
  Improve systemd service documentation
 2016-10-24 11:39:14 +02:00
Vedran Pavic
469a4e3444 Improve systemd service documentation 
Closes gh-6954
 2016-10-24 11:37:53 +02:00
Stephane Nicoll
4603d8259a Make MockitoTestExecutionListener public 
Closes gh-7016
 2016-10-24 11:37:20 +02:00
Stephane Nicoll
1cb389bb0a Merge branch '1.5.x' 2016-10-24 11:19:31 +02:00
Stephane Nicoll
beb3074998 Merge branch '1.4.x' into 1.5.x 2016-10-24 11:19:18 +02:00
Stephane Nicoll
2ad3a7f8a3 Merge pull request #7043 from kazuki43zoo:standard-travis-ci 
* pr/7043:
  Speed up Travis build
 2016-10-24 11:19:05 +02:00
Kazuki Shimizu
7c1f9eb1b9 Speed up Travis build 
Modify to use standard mode and directory cache for Travis CI build.

Closes gh-7043
 2016-10-24 11:18:12 +02:00
Stephane Nicoll
0234191b0a Merge branch '1.5.x' 2016-10-24 11:12:12 +02:00
Stephane Nicoll
4855bfb152 Merge branch '1.4.x' into 1.5.x 2016-10-24 11:11:56 +02:00
Stephane Nicoll
4ec77d4420 Merge pull request #7193 from izeye:patch-22 
* pr/7193:
  Polish contribution
  Add a missing return
 2016-10-24 11:11:38 +02:00
Stephane Nicoll
a03ce0a9d1 Polish contribution 
Add missing test

Closes gh-7193
 2016-10-24 11:11:15 +02:00
Johnny Lim
0b5fbbedf4 Add a missing return 
This commit adds a missing`return` in `getDataSourceBeanDefinition()`.

See gh-7193
 2016-10-24 10:41:20 +02:00
Stephane Nicoll
74d3a6616b Upgrade to liquibase 3.5.3 
Closes gh-7208
 2016-10-24 10:36:16 +02:00
Stephane Nicoll
0541c14684 Merge branch '1.5.x' 2016-10-24 10:08:32 +02:00
Stephane Nicoll
aec85787d2 Merge branch '1.4.x' into 1.5.x 2016-10-24 10:08:06 +02:00
Stephane Nicoll
f3c43e5e1a Merge pull request #6966 from izeye:unused-20160921 
* pr/6966:
  Remove unused
 2016-10-24 10:07:48 +02:00
Johnny Lim
eb7c0e4dc8 Remove unused 
Closes gh-6966
 2016-10-24 10:07:10 +02:00
Stephane Nicoll
363798e9ad Fix unresolved merge commit 
Closes gh-7206
 2016-10-23 07:51:08 +02:00
Stephane Nicoll
7fc2566650 Merge branch '1.5.x' 2016-10-22 13:57:00 +02:00
Stephane Nicoll
b0474b7c9d Merge branch '1.4.x' into 1.5.x 2016-10-22 13:56:42 +02:00
Stephane Nicoll
120ece726d Merge pull request #7203 from kdombeck:fix-typo 
* pr/7203:
  Correct typo in docs
 2016-10-22 13:56:19 +02:00
Ken Dombeck
4621f82b0e Correct typo in docs 
Closes gh-7203
 2016-10-22 13:56:07 +02:00
Phillip Webb
df3c152813 Merge '1.5.x' 2016-10-21 10:25:07 -07:00
Phillip Webb
2ba978b4ad Polish 2016-10-21 10:23:13 -07:00
Phillip Webb
1e1d929dde Merge branch '1.5.x' 2016-10-21 10:16:59 -07:00
Madhura Bhave
ab81d993e6 Add CloudFoundryDiscoveryMvcEndpoint 
Update Cloud Foundry support with a discovery endpoint that shows what
endpoints are available.

See gh-7108
 2016-10-21 10:16:09 -07:00
Madhura Bhave
7afb161fcf Add CloudFoundry EndpointHandlerMapping 
Add a CloudFoundryEndpointHandlerMapping that can expose actuator
endpoints for Cloud Foundry "appsmanager" to use.

See gh-7108
 2016-10-21 10:06:34 -07:00
Andy Wilkinson
3eb9397c9d Merge branch '1.5.x' 2016-10-20 21:03:28 +01:00
Andy Wilkinson
570b292df7 Disable JspServlet's development mode by default 
This commit switches off the auto-configured JspServlet's
development mode by default. Development mode is then switched on
when DevTools is on the class path.

Closes gh-7039
 2016-10-20 21:02:21 +01:00
Andy Wilkinson
8832df3303 Merge branch '1.5.x' 2016-10-20 20:32:49 +01:00
Andy Wilkinson
c2d97c9757 Merge branch '1.4.x' into 1.5.x 2016-10-20 20:32:34 +01:00
Andy Wilkinson
5ebfa4b139 Start building against Spring Integration 4.3.5 snapshots 
See gh-7197
 2016-10-20 20:30:52 +01:00
Andy Wilkinson
702d904d53 Merge branch '1.5.x' 2016-10-19 16:51:23 +01:00
Andy Wilkinson
d7e2708687 Merge branch '1.4.x' into 1.5.x 2016-10-19 16:51:14 +01:00
Andy Wilkinson
999fa123df Deprecate support for Gradle 2.7 and earlier 2016-10-19 16:50:35 +01:00
Andy Wilkinson
2017e763c3 Merge branch '1.5.x' 2016-10-19 14:24:37 +01:00