Commit Graph

78 Commits

Author SHA1 Message Date
bay1ts
8f5bcf40e0 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-12-08 15:34:04 +08:00
bay1ts
de6b82589d [REV] optimize node's instance api 2017-12-08 13:25:21 +08:00
崔斌
9c53b383e9 [REV]Update notation 2017-12-08 10:16:29 +08:00
bay1ts
33ab092774 [REV] optimize node's pods info and merge bugfix from release 2017-12-07 23:48:07 +08:00
崔斌
04046d4a71 [REV]Update swagger 2017-12-07 17:25:27 +08:00
崔斌
2453951f1e [REV]Update swagger 2017-12-07 16:38:58 +08:00
bay1ts
ab87db2b96 Merge remote-tracking branch 'origin/master'
Conflicts:
	pkg/api/controller/serviceAction.go
	pkg/eventlog/store/handle_message_store.go
2017-12-07 16:09:26 +08:00
bay1ts
c2269ac74d [REV] optimize,merge new code 2017-12-07 16:05:59 +08:00
bay1ts
922efec3de Optimize:remove callback 2017-12-07 15:57:06 +08:00
崔斌
2c2575dc09 [REV]Update swagger 2017-12-07 10:53:29 +08:00
崔斌
dc053301dc [REV]API ingress auth 2017-12-07 09:56:08 +08:00
goodrain
ffc1b575a8 [FIX] Merge release-3.4 2017-12-07 09:50:00 +08:00
bay1ts
09daef4c82 [REV] add update version in app_slug 2017-12-06 20:13:30 +08:00
bay1ts
2fa203c453 [REV] add update version in app_image 2017-12-06 20:10:26 +08:00
bay1ts
901cad8174 [REV] update log,add update version in app_image 2017-12-06 19:34:56 +08:00
bay1ts
e0eaa37167 [REV] update log 2017-12-06 18:33:50 +08:00
bay1ts
a4b99ac94d [FIX] fix when update version,cause nil pointer 2017-12-06 12:40:21 +08:00
崔斌
33afb152b5 [REV]Update image cloud share 2017-12-05 12:00:03 +08:00
bay1ts
761d9dcf54 [REV] reverse to old version for online env 2017-12-04 15:25:32 +08:00
崔斌
2edbe5e516 [REV]Update set cloud share “app-image” add serviceID to get image-name 2017-12-04 12:33:10 +08:00
goodrain
53d8ae9720 [FIX] Optimize sharing application error alerts 2017-12-04 11:30:22 +08:00
goodrain
3008cac1da Merge branch 'release-3.4' of code.goodrain.com:goodrain/rainbond into release-3.4 2017-12-04 10:35:36 +08:00
goodrain
9779768990 [FIX] Optimization error reminder 2017-12-04 10:34:48 +08:00
崔斌
b563245ed1 [REV]Update swagger and sql record 2017-12-03 21:56:21 +08:00
崔斌
3da1809760 [REV]Update swagger 2017-12-03 19:35:48 +08:00
崔斌
491b6c57ec [REV]Update swagger 2017-12-03 19:16:00 +08:00
bay1ts
cdafb6aedf Merge remote-tracking branch 'origin/master' 2017-12-01 12:04:24 +08:00
bay1ts
211ca103cc [REV] reverse app publish origin version,now can use it online,when deploy console new version,re-offline this function 2017-12-01 11:44:53 +08:00
ysicing
caddc26ec7 [ADD] support node build by docker 2017-11-30 22:51:08 +08:00
崔斌
e024081c1d [REV]Update swagger; port service for upstream 2017-11-30 18:55:11 +08:00
ysicing
86ce2a4520 [FIX] Modify worker startup parameters 2017-11-29 16:17:23 +08:00
bay1ts
0f66f010e8 Merge remote-tracking branch 'origin/master' 2017-11-28 19:00:25 +08:00
bay1ts
0d7fc3deb8 [REV] change update implication 2017-11-28 19:00:17 +08:00
崔斌
d806546d1a [REV] Update builder dockerfile
[REV] Update plugin upstream model

[REV] Update swagger
2017-11-28 18:58:07 +08:00
bay1ts
ef19470993 [FIX] fix error usage of json 2017-11-28 18:34:44 +08:00
bay1ts
9369434882 [FIX] fix error usage of json 2017-11-28 18:31:14 +08:00
崔斌
538acb4ead [REV]Update swagger json 2017-11-27 17:59:15 +08:00
ysicing
da2a5c25c1 [REV] fix single quote in command cause exec failed 2017-11-27 16:36:15 +08:00
ysicing
212ab85650 [FIX] Modify the rainbond-node startup parameters 2017-11-27 16:32:31 +08:00
ysicing
f49a56c11b [FIX] Modify the rainbond-node startup parameters 2017-11-27 15:54:54 +08:00
bay1ts
0b3997641f [REV] optimize app publish ,add pushing ,success,failure state 2017-11-27 14:41:21 +08:00
ysicing
7332273208 [REV] Update the packaging configuration 2017-11-27 10:20:15 +08:00
bay1ts
b9ddecb854 Merge remote-tracking branch 'origin/master' 2017-11-24 19:00:35 +08:00
bay1ts
d1b89a0afa [REV] add try catch on request method 2017-11-24 18:59:28 +08:00
崔斌
1506945c3c Merge branch 'master' of code.goodrain.com:goodrain/rainbond
# Conflicts:
#	pkg/builder/model/model.go
2017-11-24 18:25:13 +08:00
崔斌
d363741cad [REV]Optimizing plugins struct & plugins action process 2017-11-24 18:23:35 +08:00
bay1ts
5bea575188 [REV] update app_publish entity 2017-11-24 18:20:46 +08:00
bay1ts
5857dbe5fd [REV] update app_publish entity 2017-11-24 17:45:15 +08:00
bay1ts
46925c8daf [FIX] oss get prop method 2017-11-24 17:29:45 +08:00
bay1ts
6b43bd7da2 [FIX] fix code 2017-11-24 17:01:47 +08:00