]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #14203 from cbodley/wip-rgw-slo-auth-identity
authorSage Weil <sage@newdream.net>
Tue, 28 Mar 2017 22:23:36 +0000 (17:23 -0500)
committerGitHub <noreply@github.com>
Tue, 28 Mar 2017 22:23:36 +0000 (17:23 -0500)
commit4a8732eba7f782dee1eeb81fb539f32134afec7f
tree13e99e5749f5a43fe06e4cadc497276c10f90dc1
parentb0fc817458b819c6e598a2b1ce04304621b7d144
parent2e82401c918297fbcc7f830a09c1f700cd95cc27
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>