Commit Graph

190 Commits

Author SHA1 Message Date
崔斌
a29c46a0ac [REV]Update swagger json 2017-11-22 16:40:51 +08:00
bay1ts
b96090f9bd [REV] remove return 2017-11-22 16:36:54 +08:00
bay1ts
7a2a4d6117 [REV] remove return 2017-11-22 16:31:17 +08:00
bay1ts
322f58404c [FIX] fix error when build condition is blank 2017-11-22 16:00:31 +08:00
bay1ts
6f2c0947b2 Merge remote-tracking branch 'origin/master' 2017-11-22 15:40:44 +08:00
bay1ts
eb5bc4d543 [REV] prepare version,update callback to console 2017-11-22 15:40:15 +08:00
goodrain
0f2b586300 Merge branches 'master' and 'master' of code.goodrain.com:goodrain/rainbond 2017-11-22 15:26:41 +08:00
goodrain
5fda5982b9 [FIX] add all node api proxy 2017-11-22 15:26:28 +08:00
崔斌
6d53b69408 Merge branch 'master' of code.goodrain.com:goodrain/rainbond
# Conflicts:
#	pkg/api/region/region.go
#	pkg/grctl/cmd/cmd.go
2017-11-22 15:17:33 +08:00
崔斌
183e91a298 [ADD]Add grctl define source option 2017-11-22 15:09:28 +08:00
ysicing
be8a57dd79 [FIX] Modify the build image error 2017-11-22 15:08:35 +08:00
goodrain
917033fe7f Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-22 15:00:10 +08:00
bay1ts
51102ddd28 Merge remote-tracking branch 'origin/master' 2017-11-22 14:59:48 +08:00
bay1ts
7f023d8726 [REV] add builder api mount,prepare version info 2017-11-22 14:59:37 +08:00
goodrain
3c3adef3e2 [ADD] add api proxy node api 2017-11-22 14:59:20 +08:00
ysicing
493b989145 [REV] Change builder to chaos 2017-11-22 14:55:36 +08:00
bay1ts
ef0487a832 [REV] optimize code check update method 2017-11-22 14:13:02 +08:00
ysicing
ec4e7fb6cf [REV] Remove the error makefile 2017-11-22 14:02:29 +08:00
ysicing
24bb6beb3d [REV] Update Makefile 2017-11-22 13:56:59 +08:00
bay1ts
34c23d2954 [REV] remove useless log 2017-11-22 13:49:19 +08:00
bay1ts
a9f3ac3481 [REV] replace json impl 2017-11-22 13:43:19 +08:00
bay1ts
5ee024c085 [REV] optimize unmarshal json 2017-11-22 13:33:20 +08:00
bay1ts
73cc6b5392 [FIX] add log in py and go,fix data overwrite 2017-11-22 13:22:27 +08:00
bay1ts
3747b6a671 [FIX] add log in py and go,fix data overwrite 2017-11-22 13:20:59 +08:00
bay1ts
d7028a906a [FIX] add log in py and go,fix data overwrite 2017-11-22 12:47:09 +08:00
bay1ts
eabb75e4bc [FIX] add log in py and go 2017-11-22 12:41:42 +08:00
bay1ts
9a2a7d1749 [FIX] fix wrong arguments num 2017-11-22 12:29:26 +08:00
bay1ts
84a817ff8b [REV] optimize app publish callback 2017-11-22 12:24:35 +08:00
bay1ts
e6db144909 [FIX] remove region config 2017-11-22 12:16:06 +08:00
bay1ts
47e3a40322 [FIX] fix region api method error 2017-11-22 12:11:31 +08:00
bay1ts
b9750611de [ADD] add rainbond_node sdk,add cluster init and node install command 2017-11-22 11:40:14 +08:00
bay1ts
c12fc9404d [REV] optimize builder dao,update api 2017-11-22 11:35:19 +08:00
bay1ts
0430299cbd [REV] optimize builder API 2017-11-22 10:57:35 +08:00
bay1ts
316cb981ef Merge remote-tracking branch 'origin/master' 2017-11-22 10:36:48 +08:00
bay1ts
6e909b0f13 [REV] optimize builder API 2017-11-22 10:35:44 +08:00
goodrain
4f0c73c3c7 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-22 10:24:27 +08:00
goodrain
527e9029ed [FIX] Modify the Readme 2017-11-22 10:24:13 +08:00
崔斌
5c7d1ff141 [REV] circuit’s params setting, 1025 as 0
[DEL] del header setting
2017-11-21 18:43:18 +08:00
ysicing
059183158d Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-21 16:48:57 +08:00
ysicing
70a3b80558 [REV] update the image name and packaging 2017-11-21 16:45:02 +08:00
崔斌
5ef9e238cd [REV]Add etcd records compatibility 2017-11-21 15:44:14 +08:00
崔斌
9230f03aa6 [FIX]Fix bug in create service when pluginrelation length is 0 2017-11-21 15:11:56 +08:00
goodrain
46c3b68757 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-21 15:06:12 +08:00
goodrain
ac76c5def4 [FIX] resolve depend task not found bug 2017-11-21 15:06:03 +08:00
bay1ts
d0e8ecc1a9 Merge remote-tracking branch 'origin/master' 2017-11-21 14:36:02 +08:00
bay1ts
ef9efa4f65 [FIX] fix handle status function,when last action timeout,will not block next action 2017-11-21 14:35:43 +08:00
goodrain
c926a23a23 [FIX] resolve local volume bug 2017-11-21 12:49:02 +08:00
goodrain
efa49474ab Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-11-21 12:31:42 +08:00
goodrain
37b70e7ab4 [FIX] Solve the mq memory leak problem 2017-11-21 12:31:33 +08:00
崔斌
ed80e1f335 [REV]Update default serviceAlias use destination service alias 2017-11-21 11:24:41 +08:00