]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge PR #26924 into nautilus
authorSage Weil <sage@redhat.com>
Thu, 14 Mar 2019 11:59:05 +0000 (06:59 -0500)
committerSage Weil <sage@redhat.com>
Thu, 14 Mar 2019 11:59:05 +0000 (06:59 -0500)
commit8fde68152dc75db6fb77672aa8577130a35af524
tree0e0081dfae75aeadeda32cc3ffff46b05acbd691
parentd8b10c3417e3a6fe07fc7b4b9edb152b5edee33e
parentd44b05548715f701f1cc66dd42e27343bcb25f88
Merge PR #26924 into nautilus

* refs/pull/26924/head:
auth/cephx: fix decode_encrypt error handling
auth/cephx: fix encode_encrypt error handling

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