提交 · 56f7dabb6708827c4f8c435011a8ec369134f555 · 水淹萌龙 / kubesphere

23 11月, 2018 2 次提交
- Z
  Merge pull request #211 from wansir/master · 56f7dabb
  由 zryfish 提交于 11月 23, 2018
```
fix bug: rolebinding cannot delete
```
  56f7dabb
- H
  
  fix bug: rolebinding cannot delete · a908757c
  由 hongming 提交于 11月 22, 2018
  
  a908757c
22 11月, 2018 2 次提交
- Z
  Merge pull request #212 from zryfish/node_roles · c7a1011e
  由 zryfish 提交于 11月 22, 2018
```
fix node role bug
```
  c7a1011e
- J
  
  fix node role bug · c07611cb
  由 jeff 提交于 11月 22, 2018
  
  c07611cb
21 11月, 2018 3 次提交
- Z
  Merge pull request #209 from wansir/master · ba920915
  由 zryfish 提交于 11月 21, 2018
```
fix bug:db init failed,clusterrolebinding sync error
```
  ba920915
- Z
  Merge pull request #210 from carmanzhang/monitor · f79ae414
  由 zryfish 提交于 11月 21, 2018
```
changed promqls and fixed several monitoring bugs
```
  f79ae414
- H
  
  fix bug:db init failed,clusterrolebinding sync error · 49d40f48
  由 hongming 提交于 11月 20, 2018
  
  49d40f48
20 11月, 2018 1 次提交
- C
  
  changed promqls and fixed several monitoring bugs · 982c4ac3
  由 Carman Zhang 提交于 11月 20, 2018
  
  982c4ac3
16 11月, 2018 7 次提交
- Z
  Merge pull request #206 from wansir/master · 7f780bd3
  由 zryfish 提交于 11月 16, 2018
```
refactor workspace api
```
  7f780bd3
- Z
  Merge pull request #208 from carmanzhang/monitor · 6156b6da
  由 zryfish 提交于 11月 16, 2018
```
fixed monitor bugs
```
  6156b6da
- H
  Merge remote-tracking branch 'upstream/master' · bce25036
  由 hongming 提交于 11月 16, 2018
```
# Conflicts:
#	pkg/models/workspaces/workspaces.go
```
  bce25036
- J
  
  refactor workspace api · e9038e94
  由 jeff 提交于 11月 06, 2018
  
  e9038e94
- C
  
  add load average metrics, change prometheus apiserver svc · df31cab3
  由 Carman Zhang 提交于 11月 16, 2018
  
  df31cab3
- C
  
  fixed rank · 16eac8ce
  由 Carman Zhang 提交于 11月 16, 2018
  
  16eac8ce
- C
  
  fixed component and cluster metrics · c5d9da99
  由 Carman Zhang 提交于 11月 16, 2018
  
  c5d9da99
15 11月, 2018 1 次提交
- Z
  Merge pull request #204 from carmanzhang/monitor · 066f36b8
  由 zryfish 提交于 11月 15, 2018
```
fixed deployment-pods metrics
```
  066f36b8
14 11月, 2018 1 次提交
- C
  
  fixed deployment-pods metrics · beb7efda
  由 Carman Zhang 提交于 11月 14, 2018
  
  beb7efda
11 11月, 2018 2 次提交
- Z
  Merge pull request #201 from carmanzhang/monitor · fbf05330
  由 zryfish 提交于 11月 11, 2018
```
Refactor monitor module
```
  fbf05330
- C
  
  reformat monitoring apis · f9057a07
  由 Carman Zhang 提交于 11月 09, 2018
  
  f9057a07
08 11月, 2018 2 次提交
- Z
  Merge pull request #202 from zryfish/fix_component_status_bug · 02124c2a
  由 zryfish 提交于 11月 08, 2018
```
component status
```
  02124c2a
- J
  
  component status · 3a38a83d
  由 jeff 提交于 11月 08, 2018
  
  3a38a83d
07 11月, 2018 1 次提交
- Z
  Merge pull request #200 from zryfish/component_status · 1b15e5e7
  由 zryfish 提交于 11月 07, 2018
```
component status
```
  1b15e5e7
06 11月, 2018 2 次提交
- J
  
  component status · a38bb378
  由 jeff 提交于 11月 06, 2018
  
  a38bb378
- 不
  Merge pull request #199 from wansir/master · c5b11300
  由不羁提交于 11月 06, 2018
```
refactor workspace api
```
  c5b11300
01 11月, 2018 2 次提交
- H
  Merge remote-tracking branch 'upstream/master' · e8a4a868
  由 hongming 提交于 11月 01, 2018
```
# Conflicts:
#	pkg/apis/v1alpha/monitoring/monitor_handler.go
#	pkg/models/metrics/metricscollector.go
#	pkg/models/metrics/metricsconst.go
```
  e8a4a868
- H
  
  refactor workspace api · 70065d43
  由 hongming 提交于 10月 25, 2018
  
  70065d43
29 10月, 2018 1 次提交
- Z
  Merge pull request #194 from wansir/master · 313ebea1
  由 zryfish 提交于 10月 29, 2018
```
add workspace api
```
  313ebea1
26 10月, 2018 1 次提交
- R
  Merge pull request #197 from richardxz/master · a9cd9612
  由 richardxz 提交于 10月 26, 2018
```
add "Terminating" status in pvc's lifecycle
```
  a9cd9612
25 10月, 2018 1 次提交
- R
  
  add "Terminating" status in pvc's lifecycle · 03a37e70
  由 richardxz 提交于 10月 25, 2018
  
  03a37e70
24 10月, 2018 2 次提交
- R
  Merge pull request #196 from richardxz/master · 920d0904
  由 richardxz 提交于 10月 24, 2018
```
ignore the role/clusterrole which don't have "creator" annotation
```
  920d0904
- R
  
  ignore the role/clusterrole which don't have "creator" annotation · 33dd9fb2
  由 richardxz 提交于 10月 24, 2018
  
  33dd9fb2
23 10月, 2018 2 次提交
- Z
  Merge pull request #195 from richardxz/master · 59d26c28
  由 zryfish 提交于 10月 23, 2018
```
fix err in service type's judgment
```
  59d26c28
- R
  
  fix err in service type · 75d8787f
  由 richardxz 提交于 10月 23, 2018
  
  75d8787f
22 10月, 2018 1 次提交
- H
  
  add workspace api · a8d5f552
  由 hongming 提交于 10月 16, 2018
  
  a8d5f552
17 10月, 2018 4 次提交
- Z
  Merge pull request #192 from carmanzhang/master · 5fb551e8
  由 zryfish 提交于 10月 17, 2018
```
 add cluster/workspace level multiple metrics in dashboard
```
  5fb551e8
- C
  
  add cluster level multiple metrics in dashboard · c65ecddb
  由 Carman Zhang 提交于 10月 12, 2018
  
  c65ecddb
- R
  Merge pull request #193 from richardxz/master · d368a791
  由 richardxz 提交于 10月 17, 2018
```
update job's "rerun" function
```
  d368a791
- R
  
  update job's "rerun" function · b982f133
  由 richardxz 提交于 10月 15, 2018
  
  b982f133
12 10月, 2018 1 次提交
- Z
  Merge pull request #190 from wansir/master · 5a51bb68
  由 zryfish 提交于 10月 12, 2018
```
add openpitrix proxy token
```
  5a51bb68
11 10月, 2018 1 次提交
- R
  Merge pull request #191 from richardxz/master · 5a71eaf7
  由 richardxz 提交于 10月 11, 2018
```
avoid incorrect result when list resource with search conditions
```
  5a71eaf7

水淹萌龙 / kubesphere 与 Fork 源项目一致

水淹萌龙 / kubesphere
与 Fork 源项目一致