diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-23 16:15:26 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-23 16:15:26 +0000 |
| commit | 63379a2ae7f04f533780ee53c04a0d2847c600aa (patch) | |
| tree | 60089ab48bdc34b884909039660e42061322ddeb /lib/api/environments.rb | |
| parent | 31413f4c1469ebffe00cc657c3f94a59b48ace07 (diff) | |
| parent | 7a73cff72edccfe00eeb78657c338bd996e1c561 (diff) | |
| download | gitlab-ce-63379a2ae7f04f533780ee53c04a0d2847c600aa.tar.gz | |
Merge branch '46259-prometheus-integration-fails-on-kube-1-10' into 'master'
Resolve "Prometheus integration fails on k8s 1.10"
Closes #46259
See merge request gitlab-org/gitlab-ce!19082
Diffstat (limited to 'lib/api/environments.rb')
0 files changed, 0 insertions, 0 deletions