From: John Spray <jspray@redhat.com>
Date: Wed, 4 Oct 2017 14:13:45 +0000 (+0100)
Subject: Merge pull request #17746 from elliswuuuuuuuu/wip-prometheus
X-Git-Tag: v13.0.1~681
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e25d30c612af54b7692ff8a91a3af2bbddeea6e1;p=ceph.git

Merge pull request #17746 from elliswuuuuuuuu/wip-prometheus

ceph-mgr: can not change prometheus port for mgr

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
---

e25d30c612af54b7692ff8a91a3af2bbddeea6e1