]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #13468 from vumrao/wip-vumrao-18932
authorKefu Chai <tchaikov@gmail.com>
Mon, 20 Feb 2017 03:06:06 +0000 (11:06 +0800)
committerGitHub <noreply@github.com>
Mon, 20 Feb 2017 03:06:06 +0000 (11:06 +0800)
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>

Trivial merge