From: Sage Weil <sage@redhat.com>
Date: Tue, 18 Dec 2018 22:21:27 +0000 (-0600)
Subject: Merge PR #25470 into master
X-Git-Tag: v14.1.0~588
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=403622be721a460f3dff2d84f6bfc628f5026704;p=ceph.git

Merge PR #25470 into master

* refs/pull/25470/head:
	mon: CephBool -> CephChoices in command map for pre-nautilus mons
	mon/MonCommand: populate 'availability' field for compat

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
---

403622be721a460f3dff2d84f6bfc628f5026704