Commit Graph

4372 Commits

Author SHA1 Message Date
凡羊羊
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
GLYASAI
c45107a1fb fix update plugin discover config 2020-03-05 18:07:14 +08:00
barnettZQG
e28f00cd09
Merge pull request #696 from GLYASAI/V5.2
wrong usage of context
2020-03-05 13:36:18 +08:00
barnettZQG
8b983ee1b5
Merge pull request #695 from GLYASAI/ngxlog
change nginx log level
2020-03-05 13:35:50 +08:00
黄润豪
6716a8fdd1
Merge branch 'V5.2' into V5.2 2020-03-05 11:13:34 +08:00
黄润豪
1ac85963e2
Merge branch 'V5.2' into ngxlog 2020-03-05 11:10:50 +08:00
GLYASAI
4dd5eba80c change nginx log level 2020-03-05 10:48:10 +08:00
黄润豪
748a616c15
Merge pull request #699 from fanyangyang/coding/1115
force delete import app file
2020-03-05 09:44:53 +08:00
凡羊羊
fd3d895224 force delete import app file 2020-03-04 23:47:39 +08:00
黄润豪
1404f43b96
Merge pull request #697 from fanyangyang/coding/1681
support custom pvc name
2020-03-04 17:45:40 +08:00
凡羊羊
55ed4b8921 support custom pvc name 2020-03-04 17:24:54 +08:00
黄润豪
b72df82fbf
Merge branch 'V5.2' into V5.2 2020-03-04 16:53:08 +08:00
GLYASAI
4dccccaf16 wrong usage of context 2020-03-04 16:45:09 +08:00
黄润豪
27f37adb5f
Merge pull request #694 from fanyangyang/coding/1476
update run job
2020-03-03 13:17:10 +08:00
凡羊羊
c16cfe05ce remove wrong ctx.Done() 2020-03-03 12:25:21 +08:00
凡羊羊
54427b8889 wait old job clean 2020-03-03 11:37:10 +08:00
凡羊羊
9b2cd6717e fix wrong service type 2020-03-03 10:37:40 +08:00
凡羊羊
e76aa6952e update run job 2020-03-01 23:26:54 +08:00
barnettZQG
7ecff55d41
Merge pull request #691 from fanyangyang/volume_type/default_name
support volume name_show
2020-02-29 16:35:56 +08:00
barnettZQG
5171c0cbdd
Merge pull request #692 from fanyangyang/fix/service_mem
fix service used_mem
2020-02-29 16:34:57 +08:00
barnettZQG
7f2f4cb99d
Merge pull request #693 from GLYASAI/gateway
fix gateway stuck in starting
2020-02-29 16:34:30 +08:00
GLYASAI
211adce42e fix gateway stuck in starting 2020-02-29 14:28:37 +08:00
凡羊羊
961eaddcd3 remove used_mem 2020-02-27 16:40:01 +08:00
凡羊羊
b297485099 fix service used_mem 2020-02-27 16:30:23 +08:00
黄润豪
67b33f0f37
Merge branch 'V5.2' into volume_type/default_name 2020-02-26 19:23:28 +08:00
黄润豪
a456b456b1
Merge pull request #690 from fanyangyang/service_status
Service status
2020-02-26 19:21:13 +08:00
凡羊羊
27776b0a62 support volume name_show 2020-02-25 22:16:34 +08:00
凡羊羊
fd0bcd8b8d update service status api, add used_mem 2020-02-25 20:03:21 +08:00
凡羊羊
3bfcea7665 update mock 2020-02-25 17:25:26 +08:00
黄润豪
0896543623
Merge pull request #686 from fanyangyang/issue/683
fix source code source dir
2020-02-24 17:21:46 +08:00
凡羊羊
810685825e fix source code source dir 2020-02-24 16:04:10 +08:00
barnettZQG
a24b33fb43
Merge pull request #657 from fanyangyang/etcdclean
Etcdclean
2020-02-24 14:24:55 +08:00
凡羊羊
c02375a80d handle merge 2020-02-24 14:03:06 +08:00
barnettZQG
9c9b00249e fix build bug 2020-02-24 13:52:40 +08:00
凡羊羊
afdfe264ff Merge branch 'etcdclean' of https://github.com/fanyangyang/rainbond into etcdclean 2020-02-24 12:54:16 +08:00
凡羊羊
4e4ac133bf merge from V5.2 2020-02-24 12:53:03 +08:00
凡羊羊
cacae1c823 update etcd clean 2020-02-24 12:38:18 +08:00
barnettZQG
424f3f2266
Merge pull request #685 from fanyangyang/enterprise/runningservices
enterprise running servicees
2020-02-24 10:47:48 +08:00
barnettZQG
9854c9b3b0 Merge branch 'V5.1' into V5.2 2020-02-24 10:31:08 +08:00
barnettZQG
3572189b2c
Merge pull request #682 from fanyangyang/storage
update tenant_service struct, add service_type
2020-02-24 10:18:42 +08:00
凡羊羊
0ff4a17ee0 update get enterprise running services 2020-02-21 22:43:28 +08:00