Commit Graph

733 Commits

Author SHA1 Message Date
pujielan
97a3d4d4dd [ADD] Set debugger log 2017-12-26 15:44:16 +08:00
pujielan
74d0d97800 Merge branch 'master' into cuib-local-master 2017-12-26 10:44:40 +08:00
pujielan
025bfae524 [REV] Update plugin condition 2017-12-26 10:41:52 +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
16f9457f81 [REV] Update last after building 2017-12-25 16:03:51 +08:00
pujielan
4405799435 [REV] Update “success” after building 2017-12-25 15:55:21 +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
goodrain
50af5e7051 [FIX] print log 2017-12-22 18:13:48 +08:00
bay1ts
492ae3d53f [REV] optimize task delete strategy 2017-12-22 17:09:57 +08:00
goodrain
17183c19b4 [FIX] config array value Deweight 2017-12-22 17:01:54 +08:00
goodrain
7ccc4ca9f4 [FIX] fix the bug that configs value type is []interface{} 2017-12-22 16:45:21 +08:00
bay1ts
0efd81284e [REV] optimize error handle 2017-12-22 16:23:19 +08:00
bay1ts
934ef6be08 Merge remote-tracking branch 'origin/taskengin' into taskengin 2017-12-22 15:53:56 +08:00
bay1ts
7fb55207a8 [REV] optimize node add when failed 2017-12-22 15:49:22 +08:00