Commit Graph

3750 Commits

Author SHA1 Message Date
凡羊羊
32305a16da can not process event return 409 2019-08-27 11:47:33 +08:00
GLYASAI
249f2ab9c5 [FIX] no branch for code info 2019-08-27 11:29:23 +08:00
barnettZQG
83621fde36
Merge pull request #395 from fanyangyang/fix/chineselog
modify log message
2019-08-26 05:58:04 -05:00
barnettZQG
fe9e52a1c1
Merge pull request #396 from fanyangyang/fix/statuscode
fix event status check error
2019-08-26 05:57:40 -05:00
凡羊羊
f972ee8962 fix event status check error 2019-08-26 18:19:50 +08:00
barnettZQG
7e6e0bd44b
Merge pull request #392 from GLYASAI/podstatus
[ADD] pod ip in pod detail
2019-08-26 05:13:43 -05:00
凡羊羊
ba2d79870f modify log message 2019-08-26 17:55:32 +08:00
GLYASAI
184406ba4b [FIX] conflict from goodrain/master 2019-08-26 17:52:30 +08:00
黄润豪
34542886e8
Merge branch 'master' into podevent 2019-08-26 17:34:24 +08:00
GLYASAI
57d60d7079 [REV] merge from goodrain/master 2019-08-26 16:55:18 +08:00
黄润豪
ae65d2b4ce
Merge branch 'master' into podstatus 2019-08-26 16:53:49 +08:00
GLYASAI
4f013c2989 [ADD] pod ip in pod detail 2019-08-26 16:50:23 +08:00
GLYASAI
de69339d4a [ADD] record OOMKilled 2019-08-26 16:21:48 +08:00
barnettZQG
c361b2b08e
Merge pull request #390 from fanyangyang/fix/eventsort
fix event list sort bugs, 'order by start_time desc, id desc'
2019-08-26 01:07:28 -05:00
barnettZQG
df33e4b6bf
Merge pull request #389 from fanyangyang/fix/probe
fix probe event bugs, return code = 200 when success
2019-08-26 01:06:25 -05:00
凡羊羊
bb1d3c0c9b
Merge branch 'master' into fix/probe 2019-08-26 13:49:42 +08:00
凡羊羊
7a60f5d99b
Merge branch 'master' into fix/eventsort 2019-08-26 13:49:26 +08:00
barnettZQG
2ee91e7c13
Merge pull request #388 from GLYASAI/podstatus
[FIX] nil pointer dereference
2019-08-26 00:15:08 -05:00
barnettZQG
270b77b11a
Merge pull request #387 from GLYASAI/poddetail
[ADD] field 'versoin' in pod detail
2019-08-26 00:14:32 -05:00
GLYASAI
80a7443e7b [FIX] nil pointer dereference 2019-08-26 12:53:12 +08:00
凡羊羊
0495e2b06b fix probe event bugs, return code = 200 when success 2019-08-26 11:55:37 +08:00
barnettZQG
0cfa50f9bf
Merge pull request #386 from GLYASAI/podstatus
[FIX] pod not found
2019-08-25 22:41:12 -05:00
GLYASAI
6395ededa9 [ADD] field 'versoin' in pod detail 2019-08-26 11:34:02 +08:00
黄润豪
09c1bc3862
Merge branch 'master' into podstatus 2019-08-26 11:24:54 +08:00
GLYASAI
0072127762 [FIX] pod not found 2019-08-26 11:16:42 +08:00
barnettZQG
8cb7bac08b
Merge pull request #384 from fanyangyang/fix/events
[FIX] fix upgrade event as asyn event type
2019-08-25 21:54:01 -05:00
凡羊羊
7e5f2090b8 fix event list sort bugs, 'order by start_time desc, id desc' 2019-08-26 10:43:11 +08:00
凡羊羊
496a63bbda [FIX] fix upgrade event as asyn event type 2019-08-25 22:10:23 +08:00
曾庆国
3cad75b5b0 Merge branch 'master' of https://github.com/goodrain/rainbond 2019-08-24 19:02:56 +08:00
曾庆国
2e602105a4 change event judge 2019-08-24 19:02:24 +08:00
barnettZQG
3552d18e3f
Merge pull request #380 from GLYASAI/poddetail
[FIX] InitContainers has nil element
2019-08-24 02:36:12 -05:00
barnettZQG
90678535f4
Merge pull request #378 from GLYASAI/master
[FIX] wrong pod status
2019-08-24 02:35:33 -05:00
曾庆国
69e0fe2aa0 change event channel name 2019-08-24 15:30:59 +08:00
GLYASAI
7d02944bdf [FIX] InitContainers has nil element 2019-08-24 14:55:08 +08:00
barnettZQG
b290761743
Merge branch 'master' into master 2019-08-24 00:31:06 -05:00
barnettZQG
00eb6ad1d9
Merge pull request #379 from fanyangyang/feature/aboutEvent
Feature/about event
2019-08-24 00:30:50 -05:00
凡羊羊
7370d24d3d
Merge branch 'master' into feature/aboutEvent 2019-08-24 10:04:27 +08:00
凡羊羊
f734121e5a Merge branch 'feature/aboutEvent' of https://github.com/fanyangyang/rainbond into feature/aboutEvent 2019-08-23 22:20:48 +08:00
凡羊羊
dcb66556cc add sort by start_time when query event 2019-08-23 22:20:35 +08:00
barnettZQG
16d9a8b99f
Merge pull request #375 from fanyangyang/feature/aboutEvent
Feature/about event
2019-08-23 09:11:45 -05:00
GLYASAI
ea4e97dad3 [FIX] wrong pod status 2019-08-23 22:06:03 +08:00
barnettZQG
05496801cf
Merge branch 'master' into feature/aboutEvent 2019-08-23 08:58:22 -05:00
凡羊羊
9c652698ab modify events api and format some code 2019-08-23 20:33:38 +08:00
barnettZQG
6faea21f7d
Merge pull request #377 from GLYASAI/master
[FIX] nil pointer dereference
2019-08-23 03:14:51 -05:00
GLYASAI
ee813624fa Merge branch 'master' of https://github.com/GLYASAI/rainbond 2019-08-23 15:55:54 +08:00
GLYASAI
1220934aca [FIX] nil pointer dereference 2019-08-23 15:55:40 +08:00
凡羊羊
6a032e74b4
Merge branch 'master' into feature/aboutEvent 2019-08-23 15:52:19 +08:00
barnettZQG
ca03891ba5
Merge pull request #376 from GLYASAI/master
[ADD] 5.1.7 new feature
2019-08-23 02:46:53 -05:00
黄润豪
b70d8426f5
Merge branch 'master' into master 2019-08-23 14:43:00 +08:00
GLYASAI
cebec7babc [REV] move log_option.go to package event 2019-08-23 14:41:56 +08:00