Commit Graph

790 Commits

Author SHA1 Message Date
Bay
8a5e0e1549 [REV] optimize master res 2017-12-27 13:30:59 +08:00
Bay
bafafc9eff Merge remote-tracking branch 'github/release-3.4.1' into release-3.4.1 2017-12-27 12:36:27 +08:00
Bay
833cdc92d2 [FIX] fix grctl up command failed,caused by master nodestatus is not null 2017-12-27 12:36:15 +08:00
ysicing
798eec5417 [FMT] del useless dependence 2017-12-26 19:04:00 +08:00
ysicing
8959e305fa update entrance 2017-12-26 18:35:37 +08:00
pujielan
fdd40a499a [FIX]Fix nginx plugin high availability bug 2017-12-26 17:52:51 +08:00
ysicing
29c09d09bd [REV] add host_id_list.conf restart api 2017-12-26 17:43:49 +08:00
Bay
9545953ee5 [REV] optimize master node info collect 2017-12-26 14:58:42 +08:00
Bay
163a1f2be9 [REV] optimize task exec command error handle 2017-12-26 14:54:09 +08:00
ysicing
88eeba8087 [REV] Adjust the installation script 2017-12-26 11:58:52 +08:00
ysicing
0d8e5a493e [REV] update release.sh 2017-12-26 11:16:13 +08:00
ysicing
2de927e20b [REV] merge branch gaops_release_3.4.1 2017-12-26 10:47:50 +08:00
goodrain
aaae305bf4 Merge branch 'master' of https://github.com/goodrain/rainbond 2017-12-26 09:50:07 +08:00
goodrain
988987a707 [FIX] remove dev shell url 2017-12-26 09:49:55 +08:00
Bay
ef002a1c48 [FIX] domain cmd in grctl build error 2017-12-26 00:06:51 +08:00
goodrain
373cdff5f9 [FIX] fix bug after merge branch 2017-12-25 19:59:35 +08:00
goodrain
9058e1e763 [FIX] Merge branches taskengin 2017-12-25 19:49:57 +08:00
goodrain
7f8a51517e [FIX] Merge branches taskengin 2017-12-25 19:49:32 +08:00
goodrain
439ad48434 [FIX] add config type []interface{} 2017-12-25 19:33:27 +08:00
pujielan
5761c32e30 Merge branch 'master' into cuib-local-master 2017-12-25 14:40:33 +08:00
Bay
aea7b87a52 [ADD] add reg node to hosts file to this branch 2017-12-25 11:21:31 +08:00
pujielan
3de2ae57fe [REV] Add complex envs delete 2017-12-25 11:14:02 +08:00
goodrain
b8cdc72731 [FIX] fix set hostname bug 2017-12-25 10:20:18 +08:00
Bay
0d73d42dcd [ADD] add reg node to hosts file to this branch 2017-12-25 00:19:28 +08:00
Bay
e9e10b8805 [REV] optimize add node logic 2017-12-25 00:13:03 +08:00
Bay
8021c955fd [REV] optimize add node logic 2017-12-25 00:06:21 +08:00
Bay
ec5b22141a [REV] optimize add node logic 2017-12-24 23:19:42 +08:00
goodrain
84a10e0785 Merge branch 'master' 2017-12-24 22:58:51 +08:00
goodrain
f636a29a94 Merge branch 'release-3.4'
# Conflicts:
#	pkg/builder/api/router.go
#	pkg/grctl/cmd/node.go
2017-12-24 22:58:20 +08:00
pujielan
a984923ed3 Merge branch 'master' into cuib-local-master 2017-12-24 22:57:18 +08:00
goodrain
24e1163035 [ADD] support set container hostname use env HOSTNAME 2017-12-24 22:57:11 +08:00
pujielan
ac2262bf75 [REV] Optimize function result code and msg 2017-12-24 22:40:15 +08:00
pujielan
8088fada79 [FIX]Fix etcd connection in define resource 2017-12-24 21:26:21 +08:00
goodrain
0b6bb81b3a [FIX] remove empty value in array 2017-12-24 18:38:07 +08:00
goodrain
512987256e Merge branch 'taskengin' of code.goodrain.com:goodrain/rainbond into taskengin 2017-12-24 00:46:34 +08:00
goodrain
1e551089e7 [FIX] array split sep change | to , 2017-12-24 00:46:24 +08:00
Bay
d986be787c [REV] change quate to single quate 2017-12-23 23:19:04 +08:00
Bay
8dd8bd5258 [REV] add quate to etcd value 2017-12-23 21:58:55 +08:00
Bay
d1c6e97c96 [REV] reverse version 2017-12-23 21:55:34 +08:00
Bay
53bb6ac84a [REV] reverse version 2017-12-23 21:54:19 +08:00
Bay
752d776439 [REV] optimize init script args,add stop to timer 2017-12-23 21:08:14 +08:00
Bay
44142e3657 [FIX] fix add node api in grctl 2017-12-23 20:00:56 +08:00
Bay
021be9d075 [REV] optimize error handle 2017-12-23 19:40:00 +08:00
Bay
b6f19c3e45 [REV] optimize add node time out 2017-12-23 19:14:00 +08:00
Bay
22dae6c85f [REV] optimize add node time out 2017-12-23 19:10:12 +08:00
Bay
2ce367019e [FIX] fix wrong type usage when add node 2017-12-23 18:45:15 +08:00
Bay
3163f2c24b Merge remote-tracking branch 'origin/taskengin' into taskengin
Conflicts:
	pkg/grctl/cmd/init.go
2017-12-22 19:25:01 +08:00
Bay
bbceece78c [FIX] fix wrong error type 2017-12-22 19:24:10 +08:00
Bay
6eda29736c
[REV] cancel publish callback to console 2017-12-22 18:20:48 +08:00
goodrain
d129ea923f [FIX] fix configs nil bug 2017-12-22 18:16:16 +08:00