]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #29806 into master
authorSage Weil <sage@redhat.com>
Thu, 22 Aug 2019 19:07:49 +0000 (14:07 -0500)
committerSage Weil <sage@redhat.com>
Thu, 22 Aug 2019 19:07:49 +0000 (14:07 -0500)
commitf61b0a21d6dd14d449122b70c5e8b3dd49eb33ac
treea0aeaa48810cff172f9e6462531312d6cc08cc41
parent79eb107a1475ec7f3eda16aefc6ee3ff9c764804
parent69a712ad4bf48eb81a503e14d9957b1186ed35f5
Merge PR #29806 into master

* refs/pull/29806/head:
mgr/BaseMgrModule: tolerate Int or Long for health 'count'

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>