From: Sage Weil <sage@newdream.net>
Date: Tue, 28 Mar 2017 22:23:36 +0000 (-0500)
Subject: Merge pull request #14203 from cbodley/wip-rgw-slo-auth-identity
X-Git-Tag: v12.0.2~270
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4a8732eba7f782dee1eeb81fb539f32134afec7f;p=ceph.git

Merge pull request #14203 from cbodley/wip-rgw-slo-auth-identity

rgw: fix build of conflict after auth rework

Reviewed-by: Sage Weil <sage@redhat.com>
---

4a8732eba7f782dee1eeb81fb539f32134afec7f