From: Xie Xingguo <258156334@qq.com>
Date: Mon, 24 Jul 2017 09:28:24 +0000 (+0800)
Subject: Merge pull request #16507 from scienceluo/patch-1
X-Git-Tag: v12.1.2~155
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42d14a62c8fe13299c02c499434ab7112b7216b0;p=ceph.git

Merge pull request #16507 from scienceluo/patch-1

Update .organizationmap

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
---

42d14a62c8fe13299c02c499434ab7112b7216b0