]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #22801 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sun, 15 Jul 2018 22:02:58 +0000 (15:02 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Sun, 15 Jul 2018 22:02:58 +0000 (15:02 -0700)
* refs/pull/22801/head:
client: add inst to asok status output

Reviewed-by: Venky Shankar <vshankar@redhat.com>
1  2 
.githubmap
src/client/Client.cc

diff --cc .githubmap
index 4ff367dbfec71328981c247a433604eaf70209b1,286a85ad0288874b8b49f2883317c58b3427856c..4a4ab96c305c085c8d48496ac78972f2f386fedf
@@@ -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>
Simple merge