]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
RGW - Fix broken merge in #37774
authorDaniel Gryniewicz <dang@redhat.com>
Wed, 28 Oct 2020 13:01:06 +0000 (09:01 -0400)
committerDaniel Gryniewicz <dang@redhat.com>
Wed, 28 Oct 2020 15:49:58 +0000 (11:49 -0400)
commite47b71955d5378d19382552cda2783d91ed3cfb5
treee849b13525ad73630751aff3c80100d6e84b3a43
parentf4cd2a17848876687cd364d2726f371d0efa9ae8
RGW - Fix broken merge in #37774

I messed up the merge in #37774 and somehow forgot to push a change.
This resulted it the flag being set on the wrong branch.  This fixes
that.

RHBZ#1845501

Signed-off-by: Daniel Gryniewicz <dang@redhat.com>
src/rgw/rgw_file.cc