From: Sage Weil <sage@newdream.net>
Date: Tue, 18 Apr 2017 18:17:52 +0000 (-0500)
Subject: Merge pull request #14619 from cbodley/wip-rgw-encryption-build-fix
X-Git-Tag: v12.0.2~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0e0fc8c20505a8dfb7cca924a85e3020a6ea7aac;p=ceph.git

Merge pull request #14619 from cbodley/wip-rgw-encryption-build-fix

rgw: remove extra RGWMPObj in rgw_multi.h

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

0e0fc8c20505a8dfb7cca924a85e3020a6ea7aac