]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3cf14fc a418a2f)
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)
* 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>
1  2 
src/rgw/rgw_admin.cc patch | diff1 | diff2 | blob | history

diff --cc src/rgw/rgw_admin.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.