test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-03 04:07:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
4,362 Commits 15 Branches 69 Tags 143 MiB
f5e047e841
Commit Graph

4362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
barnettZQG
f5e047e841 Merge branch 'V5.1' into V5.2 2020-03-11 17:53:00 +08:00
barnettZQG
eae16f9cb3
Merge pull request #714 from GLYASAI/V5.2 
ignore closed channel
 2020-03-11 17:51:09 +08:00
GLYASAI
526ebeb9e3 Merge branch 'V5.2' of https://github.com/GLYASAI/rainbond into V5.2 2020-03-11 16:56:34 +08:00
GLYASAI
d03d29e024 use informer instead of watch 2020-03-11 16:56:04 +08:00
barnettZQG
cf0474d684 fix gateway nil pointer dereference 2020-03-11 14:45:13 +08:00
黄润豪
e5cc72aa25
Merge pull request #715 from fanyangyang/issue/664 
fix issue/664
 2020-03-11 09:49:29 +08:00
凡羊羊
7998c3efb8 update certificate check 2020-03-11 09:36:09 +08:00
凡羊羊
9e9ccb123f update certificate check 2020-03-11 09:32:45 +08:00
黄润豪
dc456631dd
Merge branch 'V5.2' into V5.2 2020-03-10 23:50:56 +08:00
凡羊羊
725caa55b6 fix issue/664 2020-03-10 23:46:20 +08:00
GLYASAI
a61c46bc08 ignore closed channel 2020-03-10 22:52:16 +08:00
黄润豪
ef0b6327b0
Merge pull request #712 from fanyangyang/coding/1985 
fix install volume bugs
 2020-03-10 22:16:25 +08:00
凡羊羊
f0166234ab Merge branch 'coding/1985' of https://github.com/fanyangyang/rainbond into coding/1985 2020-03-10 19:23:33 +08:00
凡羊羊
63db292e7b use english msg 2020-03-10 19:23:14 +08:00
凡羊羊
3e63d8dcb1
Merge branch 'V5.2' into coding/1985 2020-03-10 14:29:15 +08:00
黄润豪
caab725490
Merge pull request #713 from fanyangyang/volume/restore 
fix volume restore bugs
 2020-03-10 13:34:57 +08:00
黄润豪
5ead151a34
Merge pull request #711 from fanyangyang/coding/1798 
handler initc bugs
 2020-03-10 09:59:54 +08:00
凡羊羊
822bf69a09
Merge branch 'V5.2' into volume/restore 2020-03-10 09:59:00 +08:00
凡羊羊
fe4c46edc7
Merge branch 'V5.2' into coding/1985 2020-03-10 09:58:19 +08:00
黄润豪
e5261cee9c
Merge pull request #710 from fanyangyang/coding/1956 
set timeout 3min
 2020-03-10 09:53:12 +08:00
凡羊羊
29a7d3e36a fix install volume bugs 2020-03-10 02:02:03 +08:00
凡羊羊
686d886e84 fix volume restore bugs 2020-03-10 02:01:05 +08:00
凡羊羊
5008fe91a1 handler initc bugs 2020-03-09 17:44:42 +08:00
凡羊羊
4484105472 set timeout 3min 2020-03-09 16:40:29 +08:00
黄润豪
998b61d949
Merge pull request #709 from GLYASAI/V5.2 
change prom image
 2020-03-09 13:34:59 +08:00
凡羊羊
ac4c28492a
Merge branch 'V5.2' into V5.2 2020-03-09 13:08:05 +08:00
GLYASAI
f0cdf0438e change prom image 2020-03-09 11:40:00 +08:00
barnettZQG
366def874f
Merge pull request #708 from GLYASAI/historylog 
fix history log not found
 2020-03-08 19:08:31 +08:00
GLYASAI
6172643078 use GrdataLogPath 2020-03-08 01:41:44 +08:00
GLYASAI
78413473e4 add nginx error log level 2020-03-07 23:26:53 +08:00
barnettZQG
9a62437fac
Merge pull request #705 from GLYASAI/goodrain.me 
make image repo configurable
 2020-03-07 18:22:55 +08:00
GLYASAI
49ee5e307e Merge branch 'goodrain.me' of https://github.com/GLYASAI/rainbond into goodrain.me 2020-03-07 17:49:09 +08:00
黄润豪
9867163d32
Merge branch 'V5.2' into goodrain.me 2020-03-07 16:57:36 +08:00
黄润豪
7e1503ab49
Merge pull request #706 from GLYASAI/grdata 
gen mount command for nfs and nas
 2020-03-07 16:33:49 +08:00
GLYASAI
655e3729f5 use image from BuildPluginTaskBody 2020-03-07 16:16:26 +08:00
黄润豪
2a034bf88f
Merge branch 'V5.2' into grdata 2020-03-07 16:13:14 +08:00
GLYASAI
13f981be66 gen mount command for nfs and nas 2020-03-07 16:12:22 +08:00
GLYASAI
4918c66a2b make image repo configurable 2020-03-07 12:03:51 +08:00
GLYASAI
d28fab5ca1 Merge remote-tracking branch 'goodrain/V5.2' into goodrain.me 2020-03-06 15:03:35 +08:00
黄润豪
88e7d7f690
Merge pull request #703 from fanyangyang/coding/1705 
Coding/1705
 2020-03-06 14:34:37 +08:00
凡羊羊
9d0d2a4f94 modify error msg 2020-03-06 14:14:06 +08:00
GLYASAI
defa02c83a use constant 2020-03-06 14:00:19 +08:00
凡羊羊
ed52d1b68d update error desc 2020-03-06 13:40:27 +08:00
凡羊羊
1af4e75453 force backup 2020-03-06 13:34:09 +08:00
GLYASAI
028ec2bc2b rm rbd endpoints 2020-03-06 10:40:19 +08:00
barnettZQG
245d645d59
Merge pull request #702 from fanyangyang/coding/1761 
update service type check func
 2020-03-06 09:39:49 +08:00
凡羊羊
605c2634bc
Merge branch 'V5.2' into coding/1761 2020-03-05 18:56:17 +08:00
凡羊羊
44f050fb87 update service type check func 2020-03-05 18:39:38 +08:00
barnettZQG
10b269f8ee
Merge pull request #701 from GLYASAI/updplugin 
fix update plugin discover config
 2020-03-05 18:28:36 +08:00
黄润豪
37ac1e9d29
Merge branch 'V5.2' into updplugin 2020-03-05 18:12:01 +08:00