From: Sage Weil <sage@redhat.com>
Date: Thu, 28 Nov 2019 14:54:19 +0000 (-0600)
Subject: Merge PR #31914 into master
X-Git-Tag: v15.1.0~726
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=be6dd892e4750fc8ed41c215cb2fb7a7ef277431;p=ceph.git

Merge PR #31914 into master

* refs/pull/31914/head:
	mgr/orchestrator: set node labels to empty list if none specified

Reviewed-by: Joshua Schmid <jschmid@suse.de>
Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kiefer Chang <kiefer.chang@suse.com>
---

be6dd892e4750fc8ed41c215cb2fb7a7ef277431
diff --cc .githubmap
index 21e4cd3144cf,21e4cd3144cf..c2b6c776551b
--- a/.githubmap
+++ b/.githubmap
@@@ -108,3 -108,3 +108,5 @@@ mgfritch Michael Fritch <mfritch@suse.c
  xiaoxichen Xiaoxi Chen <superdebuger@gmail.com>
  toabctl Thomas Bechtold <tbechtold@suse.com>
  dsavineau Dimitri Savineau <dsavinea@redhat.com>
++jschmid1 Joshua Schmid <jschmid@suse.de>
++bk201 Kiefer Chang <kiefer.chang@suse.com>