Commit Graph

3486 Commits

Author SHA1 Message Date
bay1ts
321f89794c Merge remote-tracking branch 'origin/master' 2017-11-20 18:22:10 +08:00
goodrain
8d25639916 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-20 18:13:05 +08:00
goodrain
6f13e31ba7 [ADD] add webcli code 2017-11-20 18:12:53 +08:00
bay1ts
c758ba31e5 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-20 17:52:00 +08:00
bay1ts
3aaebc5dde [REV] add version table,optimize region get api return 404,update swagger,Optimize grctl noderes command,get real pods's requirements 2017-11-20 17:29:39 +08:00
崔斌
4c6f012670 [REV]Update downstream rules about http port setting 2017-11-20 16:52:14 +08:00
goodrain
6a70ad023c Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-20 15:33:06 +08:00
goodrain
b94b9761ea [FIX] fix the bug 2017-11-20 15:32:57 +08:00
崔斌
4951417494 [REV]Update discover lds/cds get rules from etcd 2017-11-20 15:26:32 +08:00
goodrain
56d7634360 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-20 15:24:35 +08:00
goodrain
a04047b5a0 [FIX] Adjust the dependent task state judgment strategy and increase the dynamic change static task 2017-11-20 15:24:24 +08:00
ysicing
93a7c3213a [ADD] Support the debian/ubuntu 2017-11-20 12:03:39 +08:00
崔斌
8424c35c10 [ADD]Add discover which can be defined by users
User can use this function to add their own env-value, this value can become effective in runtime.
2017-11-19 18:59:41 +08:00
goodrain
e3ac05e3d3 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-17 18:20:09 +08:00
goodrain
1dae20ea4c [FIX] The task scheduling algorithm is optimized 2017-11-17 18:19:54 +08:00
ysicing
72c5a02e97 [ADD] support for grctl 2017-11-17 15:25:38 +08:00
bay1ts
29ac8ec243 [REV] update build response,add vendor,optimize build/publish db update 2017-11-17 15:03:19 +08:00
bay1ts
456a8cfcf9 Merge remote-tracking branch 'origin/master'
Conflicts:
	pkg/api/controller/serviceAction.go
2017-11-17 15:00:53 +08:00
bay1ts
979662e433 [REV] update event timeout strategy 2017-11-17 12:26:46 +08:00
崔斌
9560e4db1d [FIX]Fix bug: delete service timeout.
add err.Error(), str compare to str
2017-11-17 12:08:09 +08:00
goodrain
b6084a9ab5 [FIX] Fix store mount database operation BUG 2017-11-17 11:47:19 +08:00
goodrain
3bdf539615 [FIX] Fix volume mount database operation BUG 2017-11-17 11:47:02 +08:00
bay1ts
26d7866df2 [REV] allow blank eventID param from console 2017-11-17 09:49:52 +08:00
崔斌
9ed78faf46 [ADD]Net Rules function
[DEL] delete v1 api/interface

[REV] optimize structs of api router;update swagger json
2017-11-16 19:13:14 +08:00
goodrain
cbd1196f96 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-16 18:56:03 +08:00
goodrain
f852437ed8 [FIX] change the task status about scheduler 2017-11-16 18:55:48 +08:00
bay1ts
ad6011f777 [FIX] remove wrong dao interface 2017-11-16 18:42:23 +08:00
bay1ts
3eae341d23 [REV] add log 2017-11-16 18:22:43 +08:00
bay1ts
de08bcee4e Merge remote-tracking branch 'origin/master' 2017-11-16 18:13:59 +08:00
bay1ts
fcf0a9ba3f [REV] add log 2017-11-16 18:13:28 +08:00
goodrain
4c627aab7f Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-16 18:04:11 +08:00
goodrain
560852d7be [FIX] fix nil bug 2017-11-16 18:03:55 +08:00
bay1ts
9f5edbe506 Merge remote-tracking branch 'origin/master' 2017-11-16 17:56:44 +08:00
bay1ts
746abc5dcc [REV] add log 2017-11-16 17:56:32 +08:00
goodrain
21d778744a Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-16 17:47:08 +08:00
goodrain
805c71fb4a [FIX] Add task shceduler time,Optimization scheduling algorithm 2017-11-16 17:46:57 +08:00
bay1ts
641f395a31 [REV] add log 2017-11-16 17:46:23 +08:00
bay1ts
ef27d80ebf [REV] add log 2017-11-16 17:35:59 +08:00
bay1ts
721dacfb36 [FIX] fix wrong table 2017-11-16 17:22:08 +08:00
bay1ts
e0b9982331 Merge remote-tracking branch 'origin/master' 2017-11-16 17:04:17 +08:00
bay1ts
c61025b2d3 [REV] optimize api-api return event 2017-11-16 17:04:06 +08:00
goodrain
986466f456 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-16 16:32:41 +08:00
goodrain
d3f4f399b3 [FIX] Ignore the error output from task 2017-11-16 16:32:27 +08:00
bay1ts
d6929e7465 Merge remote-tracking branch 'origin/master' 2017-11-16 16:31:01 +08:00
bay1ts
bd35788865 [REV] builder api optimize;add service discover to builder;import unify db to eventlog;remove unused event_id;add event entity ;create event in controller level;add event status update 2017-11-16 16:30:22 +08:00
goodrain
a943ac562a Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-16 14:59:12 +08:00
goodrain
72ee09883b [FIX] Redo the related API for the node management and match the new node model 2017-11-16 14:58:59 +08:00
ysicing
fdbe94a7ec Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-16 13:38:23 +08:00
ysicing
e177400318 [FIX] rainbond node start scripts 2017-11-16 13:38:12 +08:00
bay1ts
f943fffb69 Merge remote-tracking branch 'origin/master' 2017-11-16 12:00:10 +08:00