Commit Graph

4892 Commits

Author SHA1 Message Date
GLYASAI
421dec1630 delete apcera termtables 2020-09-30 16:04:13 +08:00
GLYASAI
62bdf00a00 fix merge conflict 2020-09-30 13:58:23 +08:00
黄润豪
063a2a3189
Merge branch 'master' into k8s-service 2020-09-30 13:54:51 +08:00
barnettZQG
023d1c7648 Merge branch 'master' of https://github.com/goodrain/rainbond 2020-09-30 11:57:45 +08:00
barnettZQG
550b6d8f1a fixed issue #853 2020-09-30 11:57:30 +08:00
黄润豪
b93581938d
Merge branch 'master' into k8s-service 2020-09-30 11:19:01 +08:00
黄润豪
eff3416738
Merge pull request #850 from yangkaa/configV1.7
修改问题和测试
2020-09-30 11:16:57 +08:00
GLYASAI
554d67b903 Merge branch 'k8s-service' of https://github.com/GLYASAI/rainbond into k8s-service 2020-09-30 11:03:29 +08:00
GLYASAI
24482ed2f0 fix review problems 2020-09-30 11:03:14 +08:00
黄润豪
c980a4a703
Merge branch 'master' into configV1.7 2020-09-30 10:58:06 +08:00
yangk
206d2bc90f modified some code 2020-09-30 10:55:09 +08:00
黄润豪
a8f990b587
Merge branch 'master' into k8s-service 2020-09-30 10:01:27 +08:00
GLYASAI
d93510c787 new api for getting app status 2020-09-30 09:50:58 +08:00
barnettZQG
9e20df75ec change some code 2020-09-29 18:46:22 +08:00
barnettZQG
5449ee8102 support disable go proxy 2020-09-28 18:16:25 +08:00
barnettZQG
bbde302710 change resource proxy 2020-09-28 16:23:05 +08:00
barnettZQG
49db1fb522 change expired time 2020-09-28 15:30:56 +08:00
GLYASAI
ec296fa8f4 update k8s service name 2020-09-27 16:27:46 +08:00
GLYASAI
0ea7c4c81b adapt testcontainers 2020-09-27 15:17:46 +08:00
barnettZQG
4d4a24c1c0 change release bash #803 2020-09-25 15:11:49 +08:00
barnettZQG
1efabf97ba [Feature] design resource-proxy based on nginx #803 2020-09-25 15:02:26 +08:00
barnettZQG
0310685a0d Merge branch 'V5.2' 2020-09-25 11:28:58 +08:00
barnettZQG
4b7644351f change some code bug #370 2020-09-25 10:58:54 +08:00
barnettZQG
45aefa196b change code 2020-09-24 21:21:11 +08:00
barnettZQG
3b773d9bd2 Merge branch 'master' of https://github.com/goodrain/rainbond 2020-09-24 21:09:14 +08:00
barnettZQG
ff5902781a support custom service monitor #370 2020-09-24 21:09:00 +08:00
yangk
27d9fc1d33 delete useless varible 2020-09-24 20:01:43 +08:00
yangk
dbc08516f5 Merge branch 'configV1.6' of https://github.com/yangkaa/rainbond into configV1.7 2020-09-24 19:30:05 +08:00
yangk
b8b937587e solve conflict 2020-09-24 19:25:04 +08:00
黄润豪
6db672fe8e
Merge branch 'master' into configV1.5 2020-09-24 18:56:20 +08:00
黄润豪
c384dbc1ac
Merge pull request #847 from yangkaa/configV1.4
更新应用配置组
2020-09-24 18:55:49 +08:00
yangk
ce540b1a27 Merge branch 'configV1.5' of https://github.com/yangkaa/rainbond into configV1.5 2020-09-24 14:39:51 +08:00
yangk
ee98936f0f solve conflict 2020-09-24 14:38:41 +08:00
yangk
4933fff3cb added list config group unit test 2020-09-24 14:30:34 +08:00
yangk
28c88bc1c1 Merge branch 'configV1.4' of https://github.com/yangkaa/rainbond into configV1.4 2020-09-24 13:07:32 +08:00
yangk
8ea593764e modified update method 2020-09-24 13:06:22 +08:00
黄润豪
6b0cdc9d47
Merge branch 'master' into configV1.5 2020-09-24 11:47:31 +08:00
黄润豪
ce714aa743
Merge branch 'master' into configV1.4 2020-09-24 11:39:02 +08:00
黄润豪
5eeeb706ff
Merge pull request #845 from yangkaa/configV1.3
创建应用配置组接口
2020-09-24 11:38:10 +08:00
黄润豪
9ccbcb6030
Merge branch 'master' into configV1.3 2020-09-24 10:42:27 +08:00
yangk
f74c4bc0bf Merge branch 'configV1.5' of https://github.com/yangkaa/rainbond into configV1.6 2020-09-24 10:32:17 +08:00
yangk
d175e71918 Merge branch 'configV1.4' of https://github.com/yangkaa/rainbond into configV1.5 2020-09-24 10:28:04 +08:00
yangk
7f564ed086 Modified a method that does not use transactions 2020-09-24 10:25:58 +08:00
yangk
48067310ef get config group list 2020-09-24 10:05:54 +08:00
yangk
1ae6233520 delete app config group 2020-09-23 22:23:02 +08:00
yangk
040c4ab456 update config group 2020-09-23 21:41:13 +08:00
yangk
1eada17fb1 added transcation 2020-09-23 18:58:54 +08:00
yangk
244b2ff925 modified unit test 2020-09-23 15:57:19 +08:00
yangk
1d71a5f40e added wrong judgement 2020-09-23 15:51:34 +08:00
yangk
9641a41541 modified some method name 2020-09-23 15:30:31 +08:00