From: Sage Weil <sage@redhat.com>
Date: Thu, 14 Mar 2019 11:59:05 +0000 (-0500)
Subject: Merge PR #26924 into nautilus
X-Git-Tag: v14.2.0~28
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8fde68152dc75db6fb77672aa8577130a35af524;p=ceph.git

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>
---

8fde68152dc75db6fb77672aa8577130a35af524