From: Kefu Chai <tchaikov@gmail.com>
Date: Mon, 20 Feb 2017 03:06:06 +0000 (+0800)
Subject: Merge pull request #13468 from vumrao/wip-vumrao-18932
X-Git-Tag: v12.0.1~336
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0f9c15e32daf0a5d13b7e7cc53fa250948c34b6e;p=ceph.git

Merge pull request #13468 from vumrao/wip-vumrao-18932

auth: 'ceph auth import -i' overwrites caps, if caps are not specified

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

0f9c15e32daf0a5d13b7e7cc53fa250948c34b6e