]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
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)
commit0f9c15e32daf0a5d13b7e7cc53fa250948c34b6e
tree092b9a4b005e4dc8ce80925a3458c97348b9e292
parentc119da5e006afddb99884127437d33782835647f
parent90144aa64c11a685b6a7cb3aafea75d427f569be
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>