Commit Graph

219 Commits

Author SHA1 Message Date
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
goodrain
41bee0f307 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-16 11:31:26 +08:00
goodrain
9b67553ea6 [ADD] Complete group task scheduling 2017-11-16 11:31:09 +08:00
崔斌
76b73f9dbc [FIX]Fix header: null 2017-11-15 23:24:21 +08:00
ysicing
f9fa664b52 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-15 19:33:20 +08:00
ysicing
a2f0a15363 [ADD] rainbond-node build rpm package for centos7 2017-11-15 19:33:05 +08:00
崔斌
b0f9b09025 [FIX] Fix a url set bug in swagger.json production
[REV]Update swagger json
2017-11-15 19:19:59 +08:00
崔斌
3757599e5c [FIX]Fix label selecter format
[ADD]Add log debug
2017-11-15 18:46:28 +08:00
崔斌
caa683707f [FIX]add plugin info into table tenant_plugin_build_version 2017-11-15 17:55:28 +08:00
崔斌
9d54c72db4 [REV] add default env “PLUGIN_MODEL” when create plugin 2017-11-15 17:06:58 +08:00
崔斌
fe9499ad3e [REV]Update service labels add “port_protocol” for discover server 2017-11-15 16:50:41 +08:00
崔斌
2b2d7be137 [REV]Update envoy discover add http filter and circuit 2017-11-15 16:40:39 +08:00
goodrain
6379be1dd3 [ADD] mq add pprof debug api 2017-11-15 15:40:38 +08:00
bay1ts
2665dc25b6 [REV] optimize codecheck function ,add language prop 2017-11-15 15:14:34 +08:00
goodrain
06a1f5ba25 [FIX] remove mgo package 2017-11-15 11:00:32 +08:00
goodrain
074306b4a8 [FIX] Modify the schema diagram and readme 2017-11-15 10:52:12 +08:00
goodrain
5e3bd42768 [FIX] delete license code 2017-11-15 10:47:19 +08:00
goodrain
7c9bccb9ec [FIX] Modify the schema diagram and readme 2017-11-15 10:40:30 +08:00