Commit Graph

4659 Commits

Author SHA1 Message Date
barnettZQG
6e3556de7b Merge branch 'V5.2' of https://github.com/goodrain/rainbond into V5.2 2020-04-16 14:05:31 +08:00
barnettZQG
882d89d790 fix downstream cluster bug 2020-04-16 14:05:19 +08:00
黄润豪
242757fac1
Merge pull request #743 from GLYASAI/V5.2
set user and pass
2020-04-15 19:33:44 +08:00
GLYASAI
fcbb34e3f3 use GetImageUserInfo 2020-04-15 19:17:30 +08:00
GLYASAI
be6d0fe14b delete redundant else 2020-04-15 19:06:46 +08:00
GLYASAI
23f9534428 Merge branch 'V5.2' of https://github.com/GLYASAI/rainbond into V5.2 2020-04-15 19:02:23 +08:00
GLYASAI
3caf812ccb Merge remote-tracking branch 'goodrain/V5.2' into V5.2 2020-04-15 19:01:48 +08:00
黄润豪
84fcc40170
Merge pull request #742 from fanyangyang/coding/2804
use password push image
2020-04-15 18:59:00 +08:00
黄润豪
8229953e51
Merge branch 'V5.2' into V5.2 2020-04-15 18:51:35 +08:00
GLYASAI
1c4b2c8d10 set user and pass 2020-04-15 18:50:31 +08:00
凡羊羊
07003a4365 update code 2020-04-15 18:41:09 +08:00
凡羊羊
2900dc1926 use password push image 2020-04-15 18:24:20 +08:00
黄润豪
1bcebb4a63
Merge pull request #740 from GLYASAI/V5.2
fix share bugs
2020-04-15 14:25:40 +08:00
黄润豪
76738838d6
Merge branch 'V5.2' into V5.2 2020-04-15 14:05:52 +08:00
GLYASAI
385dddaa12 fix share bugs 2020-04-15 14:00:16 +08:00
黄润豪
f77043f1ce
Merge pull request #739 from fanyangyang/importapp
update import
2020-04-14 21:27:02 +08:00
凡羊羊
ee7a2e220f update import 2020-04-14 19:01:13 +08:00
黄润豪
919b3731af
Merge pull request #738 from fanyangyang/coding/2438
tcp listener
2020-04-14 17:28:44 +08:00
黄润豪
65ef4f38a4
Merge branch 'V5.2' into coding/2438 2020-04-14 17:13:16 +08:00
黄润豪
caabfc87f4
Merge pull request #737 from GLYASAI/V5.2
nil pointer reference
2020-04-14 17:12:19 +08:00
凡羊羊
b718bd8034
Merge branch 'V5.2' into coding/2438 2020-04-14 16:57:03 +08:00
GLYASAI
d2d772f2b4 nil pointer reference 2020-04-14 16:54:24 +08:00
黄润豪
347cc20de8
Merge pull request #736 from GLYASAI/V5.2
use nas as nfs
2020-04-14 13:58:26 +08:00
GLYASAI
082d569e4e Merge remote-tracking branch 'goodrain/V5.2' into V5.2 2020-04-14 13:15:37 +08:00
GLYASAI
8e71d7eda5 use nas as nfs 2020-04-14 13:15:02 +08:00
凡羊羊
476e709e0a tcp listener 2020-04-14 10:55:38 +08:00
barnettZQG
794b1cf40c
Merge pull request #731 from GLYASAI/goodrain.me
create imagePullSecret for rainbond namespace
2020-04-14 10:13:03 +08:00
barnettZQG
d8ad8d36d8
Merge pull request #723 from GLYASAI/deadlock
use sync.map
2020-04-13 21:45:22 +08:00
黄润豪
28cf73e063
Merge pull request #734 from GLYASAI/grdata
make volume dependent ok
2020-04-13 18:33:34 +08:00
黄润豪
69bf95ca56
Merge branch 'V5.2' into grdata 2020-04-13 18:14:38 +08:00
GLYASAI
732d5fd591 make volume dependent ok 2020-04-13 18:13:11 +08:00
GLYASAI
783f3cd824 use ring channel 2020-04-13 15:35:01 +08:00
GLYASAI
c2804b7345 create imagePullSecret for rainbond namespace 2020-04-13 13:44:51 +08:00
黄润豪
061d022bfb
Merge pull request #729 from fanyangyang/coding/2438
remove deprecated define
2020-04-10 17:48:11 +08:00
黄润豪
39064d4f44
Merge branch 'V5.2' into coding/2438 2020-04-10 17:32:49 +08:00
黄润豪
070affc96a
Merge pull request #728 from GLYASAI/V5.2
updaet sql driver
2020-04-10 17:19:56 +08:00
凡羊羊
f03de2eeac remove deprecated define 2020-04-10 17:02:30 +08:00
黄润豪
472b6878bb
Merge branch 'V5.2' into V5.2 2020-04-10 16:54:27 +08:00
GLYASAI
916b185792 updaet sql driver 2020-04-10 16:52:06 +08:00
黄润豪
e81f7b0042
Merge pull request #727 from fanyangyang/monitoretcd
fix monitor etcd
2020-04-10 11:46:14 +08:00
凡羊羊
62ce3a196e fix monitor etcd 2020-04-10 11:18:09 +08:00
黄润豪
6b9985a29e
Merge pull request #726 from GLYASAI/V5.2
create pvc when upgrade
2020-04-10 10:51:23 +08:00
GLYASAI
4af5cbad67 create pvc when upgrade 2020-04-10 10:16:02 +08:00
黄润豪
3c7a83bf42
Merge pull request #724 from fanyangyang/coding/2385
update volume status
2020-04-09 10:19:41 +08:00
凡羊羊
c33cc9c04c
Merge branch 'V5.2' into coding/2385 2020-04-08 18:49:56 +08:00
barnettZQG
864b733c8b
Merge pull request #725 from GLYASAI/V5.2
修复新模式 /grdata 问题
2020-04-08 18:48:57 +08:00
黄润豪
5b9a9c53d4
Merge branch 'V5.2' into V5.2 2020-04-08 18:18:46 +08:00
barnettZQG
b739f924bb fix domain third component blocking batch upgrade bug 2020-04-08 18:12:13 +08:00
黄润豪
c3f74743f2
Merge branch 'V5.2' into V5.2 2020-04-08 18:10:01 +08:00
GLYASAI
e0830287d2 path of share data 2020-04-08 18:00:37 +08:00