From: Kefu Chai <kchai@redhat.com>
Date: Sat, 26 Oct 2019 01:30:54 +0000 (+0800)
Subject: Merge pull request #31126 from wjwithagen/wjw-fix-std-bitset
X-Git-Tag: v15.1.0~1157
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=23e39ed9e50e71a8a36e620272a1c17a5450b573;p=ceph.git

Merge pull request #31126 from wjwithagen/wjw-fix-std-bitset

rgw: Select the std::bitset to resolv ambiguity

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
---

23e39ed9e50e71a8a36e620272a1c17a5450b573