From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 18 Jun 2020 16:05:08 +0000 (-0700)
Subject: Merge PR #35649 into master
X-Git-Tag: v16.1.0~2016
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9242da5a4745e7e7808d60cb2a6ac4be32f9267d;p=ceph.git

Merge PR #35649 into master

* refs/pull/35649/head:
	vstart: allow specifying a different ganesha binary
	vstart: handle multiple ganesha's more sanely

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Kotresh Hiremath Ravishankar <khiremat@redhat.com>
Reviewed-by: Varsha Rao <varao@redhat.com>
---

9242da5a4745e7e7808d60cb2a6ac4be32f9267d
diff --cc .githubmap
index 6486b04d8d0f,6486b04d8d0f..87c5895344b4
--- a/.githubmap
+++ b/.githubmap
@@@ -121,3 -121,3 +121,4 @@@ asettle Alexandra Settle <asettle@suse.
  vumrao Vikhyat Umrao <vikhyat@redhat.com>
  saschagrunert Sascha Grunert <sgrunert@suse.com>
  mchangir Milind Changire <mchangir@redhat.com>
++kotreshhr Kotresh Hiremath Ravishankar <khiremat@redhat.com>