]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #27957 into master
authorSage Weil <sage@redhat.com>
Thu, 30 May 2019 17:26:17 +0000 (12:26 -0500)
committerSage Weil <sage@redhat.com>
Thu, 30 May 2019 17:26:17 +0000 (12:26 -0500)
commitc47b322bd3a3551814d526477cf9d6a7c6525813
tree6b75414d342390e8934234a7915d44f98689e4b1
parent3cf14fcbe03a1bdcc67ed7b39546da780560682c
parenta418a2f49130e0cf4133010707819b614e192394
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>
src/rgw/rgw_admin.cc