From: Sage Weil <sage@redhat.com>
Date: Tue, 26 Nov 2019 22:18:28 +0000 (-0600)
Subject: Merge PR #31854 into master
X-Git-Tag: v15.1.0~742
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b62e23aaa6dd44e9b134c2d6edd3d5e0f1728e2a;p=ceph.git

Merge PR #31854 into master

* refs/pull/31854/head:
	mgr/orchestrator_cli: print table for 'host ls'
	mgr/ssh: populate labels
	mgr/orchestrator: add 'labels' property to InventoryNode
	mgr/ssh: add/remove labels
	mgr/orchestrator: orchestrator host label {add,rm}
	mgr/ssh: add explicit host list

Reviewed-by: Sebastian Wagner <swagner@suse.com>
---

b62e23aaa6dd44e9b134c2d6edd3d5e0f1728e2a