Commit Graph

4297 Commits

Author SHA1 Message Date
凡羊羊
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
凡羊羊
9a4af3e787 fix comment 2020-02-21 21:10:19 +08:00
凡羊羊
51efc6c6cb enterprise running servicees 2020-02-21 20:59:59 +08:00
凡羊羊
b5e629a5fa update change service type 2020-02-20 23:27:48 +08:00
凡羊羊
6ab470e491 fix add volume validate, and change service type validate 2020-02-20 17:51:48 +08:00
凡羊羊
ba7a110fcc region change service type 2020-02-20 16:15:40 +08:00
凡羊羊
ef5e85a654 fix service type while check service 2020-02-19 23:02:25 +08:00
barnettZQG
862c0ed5d5 fix dependent domain class third party component startup sequence control bug 2020-02-19 18:03:51 +08:00
barnettZQG
867e2e975e fix build version conflict bug 2020-02-19 18:03:07 +08:00
barnettZQG
51045e9a2b fix domain third service health check bug 2020-02-19 16:32:19 +08:00
凡羊羊
4393dddc63 update tenant_service struct, add service_type 2020-02-18 22:41:18 +08:00
barnettZQG
61e4b2df4e create os label where create service 2020-02-18 17:23:51 +08:00
barnettZQG
a065ab265e support set os type windows 2020-02-18 13:55:17 +08:00
barnettZQG
6e65282ab9
Merge pull request #679 from GLYASAI/V5.2
api certificate file not found
2020-02-17 10:28:52 +08:00
黄润豪
ff9c541253
Merge branch 'V5.2' into V5.2 2020-02-17 07:23:26 +08:00
GLYASAI
34528a9f35 api certificate file not found 2020-02-17 07:10:36 +08:00
黄润豪
c611023c18
Merge pull request #678 from fanyangyang/fix/coding/717
check etcd args and append
2020-02-15 23:28:40 +08:00
凡羊羊
5397b493ca
Merge branch 'V5.2' into fix/coding/717 2020-02-15 23:08:33 +08:00
凡羊羊
a4662aea16 check etcd args and append 2020-02-15 23:07:24 +08:00
barnettZQG
d5cd896898
Merge pull request #677 from GLYASAI/V5.2
fix typos
2020-02-15 17:06:28 +08:00
GLYASAI
04628dd806 Merge branch 'V5.2' of https://github.com/GLYASAI/rainbond into V5.2 2020-02-15 17:03:03 +08:00
GLYASAI
73375372c6 fix typos 2020-02-15 17:02:50 +08:00
黄润豪
c5bdf98046
Merge pull request #676 from fanyangyang/fix/coding/717
add etcd ca args
2020-02-15 15:15:00 +08:00
凡羊羊
32122af52b add etcd ca args 2020-02-15 14:38:30 +08:00
barnettZQG
29a2f9be31
Merge pull request #675 from GLYASAI/V5.2
docker certificates and hosts
2020-02-15 14:19:49 +08:00
黄润豪
46e7592fbb
Merge branch 'V5.2' into V5.2 2020-02-15 13:56:54 +08:00