Commit Graph

4665 Commits

Author SHA1 Message Date
barnettZQG
49cc4ed7c4 change tenant sort method 2020-07-28 21:37:01 +08:00
黄润豪
819f5040ba
Merge pull request #811 from GLYASAI/V5.2
image build error
2020-07-28 19:11:07 +08:00
GLYASAI
665273b998 image build error 2020-07-28 18:53:02 +08:00
黄润豪
571e3b0a32
Merge pull request #805 from GLYASAI/i2310
fix node id
2020-07-24 14:25:40 +08:00
GLYASAI
5aad9c6d67 Merge remote-tracking branch 'goodrain/V5.2' into i2310 2020-07-24 13:39:07 +08:00
黄润豪
3ea8e915ea
Merge pull request #804 from GLYASAI/V5.2
fix xdsHost condition
2020-07-24 10:07:11 +08:00
GLYASAI
5a0d41965e Merge branch 'V5.2' of https://github.com/GLYASAI/rainbond into V5.2 2020-07-24 09:51:07 +08:00
GLYASAI
780b9b5202 fix xdsHost condition 2020-07-24 09:50:22 +08:00
黄润豪
72d31526b9
Merge branch 'V5.2' into V5.2 2020-07-24 09:40:43 +08:00
GLYASAI
fe4450de6f Merge branch 'V5.2' of https://github.com/GLYASAI/rainbond into V5.2 2020-07-24 09:38:29 +08:00
GLYASAI
de933fdadc fix xdsHost condition 2020-07-24 09:38:00 +08:00
barnettZQG
e3927df490 support etcd https in monitor 2020-07-23 20:42:01 +08:00
黄润豪
4c36eee503
Merge pull request #791 from GLYASAI/repourl
change max lenght to 2047
2020-07-23 17:32:37 +08:00
黄润豪
bbdf5c5250
Merge branch 'V5.2' into repourl 2020-07-23 17:13:30 +08:00
黄润豪
eddda41e67
Merge pull request #796 from GLYASAI/i3028
ignore file not exists
2020-07-23 14:38:51 +08:00
黄润豪
fc0e3dbf2b
Merge branch 'V5.2' into repourl 2020-07-23 14:17:52 +08:00
黄润豪
76bc754400
Merge branch 'V5.2' into i3028 2020-07-23 14:17:39 +08:00
GLYASAI
67592d1f6d fix node id 2020-07-23 11:26:16 +08:00
barnettZQG
559f75fe05 add namespace total resource metric #797 2020-07-22 18:52:24 +08:00
barnettZQG
f40d0917cf remove event log message sort 2020-07-20 21:59:13 +08:00
GLYASAI
e2407efcb9 ignore file not exists 2020-07-20 15:48:58 +08:00
zsl1549
30983fb5eb
Merge branch 'V5.2' into repourl 2020-07-20 15:40:51 +08:00
barnettZQG
f8caa36906 change some bug 2020-07-19 12:13:17 +08:00
barnettZQG
8d77483d79 change pod status judgment logic 2020-07-18 22:16:11 +08:00
barnettZQG
b1b16141a4 Optimize rainbondFile environment variable reading 2020-07-18 21:47:43 +08:00
barnettZQG
caf7223acc support php parse runtime 2020-07-18 21:10:29 +08:00
barnettZQG
2f30009c9d change some code 2020-07-18 20:49:31 +08:00
barnettZQG
7b1c767a49 fix nil bug 2020-07-18 18:02:05 +08:00
barnettZQG
d9da07274b support set alert rule region name 2020-07-18 16:56:57 +08:00
barnettZQG
475d625347 fix etcd restart watcher blocking 2020-07-18 15:50:18 +08:00
barnettZQG
26f9071894 support some alert rule 2020-07-15 22:59:05 +08:00
barnettZQG
283a5ebee3
Merge pull request #792 from GLYASAI/clusterinfo
get cluster info in rbd-api
2020-07-15 04:08:06 -05:00
黄润豪
0da6a150a6
Merge branch 'V5.2' into clusterinfo 2020-07-15 17:06:41 +08:00
黄润豪
5365f805cc
Merge branch 'V5.2' into repourl 2020-07-14 17:21:52 +08:00
GLYASAI
d79eb6d13d change max lenght to 2047 2020-07-14 17:17:37 +08:00
GLYASAI
ffc0e81a42 change max length to 2047 2020-07-14 17:08:00 +08:00
barnettZQG
75c98f7834 change code 2020-07-14 16:11:30 +08:00
GLYASAI
50d50a3e55 Merge remote-tracking branch 'goodrain/V5.2' into V5.2 2020-07-13 16:07:11 +08:00
GLYASAI
1be3177e1b get cluster info 2020-07-13 16:07:06 +08:00
barnettZQG
430880284f support one ctx have multiple message channels 2020-07-12 13:44:25 +08:00
barnettZQG
26b50e3d72 add docker and monitor sub channel 2020-07-11 17:41:55 +08:00
GLYASAI
e925d74a19 Merge remote-tracking branch 'goodrain/V5.2' into V5.2 2020-07-02 10:49:13 +08:00
GLYASAI
854dbc9901 mock store 2020-07-01 16:07:38 +08:00
黄润豪
502b2077fa
Merge pull request #789 from GLYASAI/V5.2
fix wrong memory for service
2020-06-30 15:41:51 +08:00
GLYASAI
76eba04969 Merge remote-tracking branch 'goodrain/V5.2' into V5.2 2020-06-30 15:15:43 +08:00
GLYASAI
15da4546bc fix wrong memory for service 2020-06-30 15:08:20 +08:00
barnettZQG
27ed7c33c7 fix transaction bug 2020-06-29 21:12:04 +08:00
barnettZQG
8564ba80c1 add proxy timeout 2020-06-29 17:45:52 +08:00
barnettZQG
0097717b0b change import app bug 2020-06-28 12:00:28 +08:00
barnettZQG
1dcd1a369f truncation commitMsg 2020-06-28 11:43:13 +08:00