Merge pull request #7707 from neheb/patch-12
authorHannu Nyman <hannu.nyman@iki.fi>
Fri, 21 Dec 2018 15:39:14 +0000 (17:39 +0200)
committerGitHub <noreply@github.com>
Fri, 21 Dec 2018 15:39:14 +0000 (17:39 +0200)
prometheus: Update to 2.6.0


Trivial merge