]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
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)
* 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>

Trivial merge