SpringCloud/spring-cloud-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
598 Commits 27 Branches 0 Tags
cd09c75ef0fa9fc2e85cfb7079470cbf572785c9
Commit Graph

598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryan Baxter
cd09c75ef0 Version changes for 1.2.3.RELEASE 2017-03-07 19:59:10 -05:00
Spencer Gibb
100be64192 Ensures health indicator uses configured label. 
fixes gh-638

(cherry picked from commit 30a1f81)
 2017-02-14 11:44:15 -07:00
Patrick Coray
853f4d7853 Sync with upstream 2016-11-29 21:00:15 +01:00
Ryan Baxter
f48062f00c Updated generated README 2016-11-23 12:59:14 -05:00
Ryan Baxter
d2961eceae Bumped versions for next release 2016-11-23 12:59:00 -05:00
Ryan Baxter
bd3d2c94f3 Revert "Version changes for 1.2.2 RELEASE" 
This reverts commit 66c092949b.
 2016-11-23 12:51:47 -05:00
Ryan Baxter
66c092949b Version changes for 1.2.2 RELEASE 2016-11-23 12:18:12 -05:00
Ryan Baxter
4c9806b4d6 Merge pull request #538 from rlynch/master 
New Branch/Tags Not Available and Git Version Not Updated On First Request
 2016-11-21 19:44:40 -05:00
rlynch2
bf8abd9d12 Merge remote-tracking branch 'origin/new-remote-label-fix' 
Fixed implementation of TagOps.FETCH_ALL
 2016-11-05 16:23:39 -07:00
rlynch2
102dcf41cd Added TagOps.FETCH_TAGS to the fetch command so we get all tags. 2016-11-05 16:23:21 -07:00
rlynch2
29922e1a21 Merge remote-tracking branch 'origin/new-remote-label-fix' 
Added TagOpts.FETCH_ALL to the fetch
 2016-11-05 16:04:57 -07:00
rlynch2
01698dd998 Added TagOps.FETCH_TAGS to the fetch command so we get all tags. 2016-11-05 15:59:42 -07:00
rlynch2
80e6074a4f Merge remote-tracking branch 'origin/new-remote-label-fix' 
fix merge error
 2016-11-04 13:17:17 -07:00
rlynch2
588870ca5f Fixed codacy warnings/errors. 2016-11-04 13:04:57 -07:00
rlynch2
09377f38b8 Fixed codacy warnings/errors. 2016-11-04 12:59:18 -07:00
rlynch2
a05779bee6 Merge remote-tracking branch 'origin/new-remote-label-fix' 
fixed formatting
 2016-11-04 12:53:36 -07:00
rlynch2
33649fde53 Fixed codacy warnings/errors and added unit tests to test exception scenarios and increase code coverage. 2016-11-04 12:46:48 -07:00
rlynch2
904bfc37c6 fixed bad IDE formatting 2016-11-03 22:54:15 -07:00
rlynch2
e88f12b574 version not being updated on first request after update (including due to hard resets) 
New remote branches
New remote tags
— handling a null ref in should pull no longer needed.
— has added benefit of ensuring the local repo is current in case of git failure.
Returns version for tags (version was null before this change)
New starter code for remote repo testing (where a lot of the complexity lies)
 2016-11-03 22:26:29 -07:00
rlynch2
25a6e2d58d version not being updated on first request after update (including due to hard resets) 
New remote branches
New remote tags
— handling a null ref in should pull no longer needed.
— has added benefit of ensuring the local repo is current in case of git failure.
Returns version for tags (version was null before this change)
New starter code for remote repo testing (where a lot of the complexity lies)
 2016-11-03 17:46:35 -07:00
rlynch2
9a3e58e8fe version not being updated on first request 
New remote branches
New remote tags
— handling a null ref in should pull no longer needed.
— has added benefit of ensuring the local repo is current in case of git failure.
Returns version for tags
New starter code for remote repo testing (where a lot of the complexity lies)
TODO: Still investigating failure of pullDirtyRepo.  I think the test is incorrect but still validating.
 2016-11-03 17:38:21 -07:00
rlynch2
bc944a67b4 Merge remote-tracking branch 'upstream/master' 
merging with https://github.com/spring-cloud/spring-cloud-config
 2016-11-03 15:30:31 -07:00
Patrick Coray
0cd7bf991c Keep formatting of file 2016-11-03 01:29:01 +01:00
Patrick Coray
8e98a309d7 Add test to check if baseDir is deleted when clone fails 2016-11-03 01:18:48 +01:00
Ryan Baxter
bdcf5b9177 Updated README 2016-11-02 20:09:57 -04:00
Patrick Coray
9b51c34d7b Delete basedir when clone fails 2016-11-03 00:47:40 +01:00
rlynch2
3292f71902 Cleaned up a minor codacy warning. 2016-10-26 14:02:50 -07:00
rlynch2
9df9fbd1ab Adding comment as requested by spring 2016-10-26 13:55:33 -07:00
rlynch2
97e6ec4308 Merge branch 'master' of https://github.com/spring-cloud/spring-cloud-config 2016-10-26 09:44:49 -07:00
Spencer Gibb
d3cdfd35a5 comment out test for correct content type 2016-10-25 15:10:33 -06:00
Spencer Gibb
465bc94953 Make config server configuration deterministic. 
Move @Import from EnableConfigServer to ConfigServerAutoConfiguration that is only activated if Marker bean created by EnableConfigServer exists.

fixes gh-530
 2016-10-25 14:44:34 -06:00
rlynch2
9300bee308 Fixed bug which returns incorrect version number on first request after remote repo is updated. Fixed circleci warnings. 2016-10-24 21:50:33 -07:00
rlynch2
d5f4d8ed60 Fixed bug which returns incorrect version number on first request after remote repo is updated. Corrected imports. 2016-10-24 17:49:08 -07:00
rlynch2
2a3c60feb4 Fixed bug which returns incorrect version number on first request after remote repo is updated. 2016-10-24 17:41:05 -07:00
rlynch2
93fe73afcd Merge remote-tracking branch 'upstream/master' 
updating fork from master
 2016-10-24 17:27:28 -07:00
Ryan Baxter
25b25fe800 Merge pull request #528 from tan9/patch-1 
Fixed path to `spring.factories`.
 2016-10-20 07:30:57 -04:00
Pei-Tang Huang
664243bbcf Fixed path to spring.factories. 2016-10-20 17:17:02 +08:00
Ryan Baxter
6766323c40 Version changes for next release 2016-10-18 09:17:06 -04:00
Ryan Baxter
7105329eb6 Revert "Versions changes for 1.2.1 RELEASE" 
This reverts commit 6e8434cf10.
 2016-10-18 09:11:40 -04:00
Ryan Baxter
6e8434cf10 Versions changes for 1.2.1 RELEASE 2016-10-18 07:56:02 -04:00
Ryan Baxter
123011d7d5 Merge pull request #426 from spring-cloud/client-cache-health 
Cache config client health indicator.
 2016-10-13 11:19:28 -04:00
Spencer Gibb
b155a1d58b Cache config client health indicator. 
So config server isn't bombarded with requests.
 2016-10-13 09:10:32 -06:00
whboyd
6c0aa53b28 Better support custom PropertyPathNotificationExtractor (#508) 
* Make it possible to add custom webhook handling behavior without overriding default behavior

* move PropertyPathNotificationExtractorConfiguration to an inner class of EnvironmentMonitorAutoConfiguration

* fix formatting
 2016-10-13 10:44:30 -04:00
Ryan Baxter
a8f3d03593 Fixes #501 (#523) 2016-10-13 10:42:46 -04:00
whboyd
8fb43cf448 Support monitor bitbucket pull request merge 
Support monitor webhook push notifications in the event of a bitbucket pull request merge.  

Fixes gh-506
 2016-10-13 10:42:11 -04:00
Dave Syer
a7019cdd82 Widen another catch block (to be defensive) 2016-10-13 12:39:58 +01:00
Dave Syer
5898130751 Widen the catch block when monitoring local files for changes 
FileSystemNotFoundException is not uncommon if people try to
monitor directories inside jar files. But this is not an
IOException, so it needs to be handled and wasn't by the old
catch block.
 2016-10-13 10:59:11 +02:00
Ryan Baxter
1cd7372761 Merge pull request #520 from izeye/patch-1 
Fix inline comments in EnvironmentControllerTests
 2016-10-04 06:55:02 -07:00
Johnny Lim
9a3903d088 Fix inline comments in EnvironmentControllerTests 2016-10-04 13:31:11 +09:00
Dave Syer
f596d138aa Fix line endings 2016-09-28 18:03:30 -04:00