diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-23 14:40:14 +0000 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2018-05-23 14:40:14 +0000 |
| commit | 85167d25799ade8230d2a56a560a8d1a1920aa2b (patch) | |
| tree | 1af69c84e3e3c2aa13bf90af9baefbc900e6d9b3 /changelogs/unreleased/46413-error-when-prometheus-adapter-is-disabled.yml | |
| parent | 1d77de4713f49ccacb6e8819bc70321b5950ab28 (diff) | |
| parent | 0e46c1858390ae9d1366df805d1aeae37557ca8c (diff) | |
| download | gitlab-ce-85167d25799ade8230d2a56a560a8d1a1920aa2b.tar.gz | |
Merge branch '10-8-stable-patch-1-fix-conflict' into '10-8-stable-patch-1'
Fix conflict when picking `bump prometheus-client-mmap to 0.9.3 to fix nil exception error` to patch stable branch
See merge request gitlab-org/gitlab-ce!19105
Diffstat (limited to 'changelogs/unreleased/46413-error-when-prometheus-adapter-is-disabled.yml')
0 files changed, 0 insertions, 0 deletions