From: Sage Weil <sage@redhat.com>
Date: Thu, 30 May 2019 17:26:17 +0000 (-0500)
Subject: Merge PR #27957 into master
X-Git-Tag: v15.1.0~2603
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c47b322bd3a3551814d526477cf9d6a7c6525813;p=ceph-ci.git

Merge PR #27957 into master

* refs/pull/27957/head:
	json: JSONDecoder::err inherits from std::runtime_error
	rgw: RGWXMLDecoder::err inherits from std::runtime_error

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
---

c47b322bd3a3551814d526477cf9d6a7c6525813