From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sun, 15 Jul 2018 22:02:58 +0000 (-0700)
Subject: Merge PR #22801 into master
X-Git-Tag: v14.0.1~870
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3376af33a85b70b6527233ca6397bfaab6b2b033;p=ceph.git

Merge PR #22801 into master

* refs/pull/22801/head:
	client: add inst to asok status output

Reviewed-by: Venky Shankar <vshankar@redhat.com>
---

3376af33a85b70b6527233ca6397bfaab6b2b033
diff --cc .githubmap
index 4ff367dbfec7,286a85ad0288..4a4ab96c305c
--- a/.githubmap
+++ b/.githubmap
@@@ -76,6 -76,4 +76,7 @@@ yehudasa Yehuda Sadeh <yehuda@redhat.co
  yunfeiguan Yunfei Guan <yunfei.guan@xtaotech.com>
  yuriw Yuri Weinstein <yweins@redhat.com>
  yuyuyu101 Haomai Wang <haomai@xsky.com>
 +wido Wido den Hollander <wido@42on.com>
 +rishabh-d-dave Rishabh Dave <ridave@redhat.com>
 +neha-ojha Neha Ojha <nojha@redhat.com>
+ vshankar Venky Shankar <vshankar@redhat.com>