Commit Graph

790 Commits

Author SHA1 Message Date
goodrain
95f5e8aebe Merge branch 'release-3.4'
# Conflicts:
#	pkg/builder/api/router.go
#	pkg/grctl/cmd/init.go
#	pkg/grctl/cmd/installStatus.go
#	pkg/grctl/cmd/node.go
2017-12-12 11:36:57 +08:00
goodrain
d9cdae0924 [FIX] resolve architecture pic 2017-12-12 11:31:10 +08:00
bay1ts
36fc1ce593 [REV] optimize build api proxy in api 2017-12-12 11:21:34 +08:00
bay1ts
2ae00f07e3 [REV] optimize build api proxy in api 2017-12-12 10:14:44 +08:00
bay1ts
67e531820a Merge remote-tracking branch 'origin/master' 2017-12-12 10:07:55 +08:00
bay1ts
76cf3e527f [REV] optimize build api proxy in api 2017-12-12 10:07:25 +08:00
ysicing
ac7bca79df [ADD] get ext ip; update hosts scripts 2017-12-11 19:49:23 +08:00
bay1ts
15b10177b6 Merge remote-tracking branch 'origin/release-3.4' into release-3.4 2017-12-11 19:42:02 +08:00
bay1ts
b0c2dc4342 [REV] optimize grctl show command 2017-12-11 19:41:25 +08:00
bay1ts
6a5731f0bc [REV] optimize master node update hosts file 2017-12-11 19:15:58 +08:00
ysicing
8678b853a1 [FIX] add webcli command; fixed domain args error 2017-12-11 18:29:15 +08:00
bay1ts
ecce885d40 Merge remote-tracking branch 'origin/release-3.4' into release-3.4 2017-12-11 18:10:56 +08:00
goodrain
c436626b54 [FIX] fix the webcli keepalive bug 2017-12-11 17:58:26 +08:00
bay1ts
869f9d429d [REV] optimize grctl list command 2017-12-11 17:58:17 +08:00
goodrain
3feb81fd73 [FIX] resolve webcli keepalive bug 2017-12-11 17:51:30 +08:00
goodrain
a3613620a7 Merge branch 'release-3.4' of code.goodrain.com:goodrain/rainbond into release-3.4 2017-12-11 17:42:02 +08:00
goodrain
398d30f43d [FIX] resolve a bug that the web console cannot enter 2017-12-11 17:41:49 +08:00
bay1ts
755e292676 [FIX] fix rule api from /v2/nodes/{} to /v2/nodes/rule/{} 2017-12-11 17:09:50 +08:00
bay1ts
20130fb5c5 Merge remote-tracking branch 'origin/release-3.4' into release-3.4 2017-12-11 16:36:43 +08:00
bay1ts
4e85deffed [REV] optimize task execute 2017-12-11 16:36:16 +08:00
ysicing
662c868a75 [FIX] manage node adapter not exist; grctl support domain 2017-12-11 16:17:53 +08:00
bay1ts
f10ed867ee Merge remote-tracking branch 'origin/release-3.4' into release-3.4 2017-12-11 15:47:54 +08:00
崔斌
683d535453 [DEL]Update event_id remove required
[REV]Update plugin table add json annotation
2017-12-11 15:47:43 +08:00
bay1ts
df19d9ebb6 [REV] optimize domain command in release 2017-12-11 15:38:00 +08:00
bay1ts
bb8266c6ab [REV] optimize domain command in release 2017-12-11 15:36:48 +08:00
bay1ts
b431e403b2 [REV] optimize domain command 2017-12-11 15:32:39 +08:00
bay1ts
80d1d9283e [REV] optimize domain command 2017-12-11 15:12:08 +08:00
bay1ts
b52ab794b9 [REV] add domain command 2017-12-11 14:29:36 +08:00
goodrain
9897784c96 [FIX] Merge code 2017-12-11 13:56:16 +08:00
bay1ts
4b2ca65438 [REV] optimize output 2017-12-11 12:01:47 +08:00
bay1ts
c58e7ce145 [REV] optimize task depend relation,optimize node put label api 2017-12-11 11:58:39 +08:00
bay1ts
eb73a38f59 [REV] optimize get task api,optimize show command,optimize install status command,optimize node status 2017-12-11 11:51:28 +08:00
bay1ts
66f6db7361 [REV] optimize grctl show command 2017-12-11 11:10:36 +08:00
bay1ts
454f1fbd7c [REV] optimize node scheduable judge by hasrule compute,not manage 2017-12-11 10:10:36 +08:00
bay1ts
6d07bdd552 Merge branch 'master' of code.goodrain.com:goodrain/rainbond 2017-12-11 10:01:55 +08:00
bay1ts
10b7c4ea17 [REV] optimize grctl task depends command;optimize install process 2017-12-11 09:47:47 +08:00
ysicing
18864b683e [FIX] fixed gaops path 2017-12-10 22:37:48 +08:00
ysicing
a6b30948a9 [ADD] update release node; 2017-12-10 21:20:23 +08:00
bay1ts
9479528c9d [REV] optimize grctl task depends command 2017-12-09 19:57:18 +08:00
bay1ts
db6808eca0 [REV] optimize grctl install 2017-12-08 23:31:47 +08:00
bay1ts
428bef93ed [REV] optimize status function get status by node strategy;add task dependency relation 2017-12-08 21:31:55 +08:00
崔斌
cdbd46c6da [REV]Update validate time while recreate token 2017-12-08 18:53:53 +08:00
崔斌
f0a43de3b9 [REV]Update cloud auth show table format 2017-12-08 18:47:55 +08:00
goodrain
f18393ff26 [FIX] add task exec defaulet status 2017-12-08 18:22:07 +08:00
bay1ts
971b3366d3 [REV] optimize node role validate 2017-12-08 18:14:49 +08:00
bay1ts
c272a5e332 [REV] optimize get task strategy 2017-12-08 17:32:40 +08:00
崔斌
c68f30daad [ADD]Add grcth auth command 2017-12-08 17:14:12 +08:00
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
bay1ts
2a143117ac [REV] prepare fix etcd event error 2017-12-08 12:44:57 +08:00