]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #6797 from mathslinux/fix-parse-return
authorSage Weil <sage@redhat.com>
Fri, 15 Jan 2016 00:01:00 +0000 (19:01 -0500)
committerSage Weil <sage@redhat.com>
Fri, 15 Jan 2016 00:01:00 +0000 (19:01 -0500)
rgw: fix wrong check for parse() return

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
src/osd/OSD.cc
src/rgw/rgw_admin.cc
src/rgw/rgw_op.cc

diff --cc src/osd/OSD.cc
Simple merge
Simple merge
Simple merge