]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
rgw: fix conflict with cloud sync 21425/head
authorCasey Bodley <cbodley@redhat.com>
Fri, 13 Apr 2018 20:29:21 +0000 (16:29 -0400)
committerCasey Bodley <cbodley@redhat.com>
Fri, 13 Apr 2018 20:31:05 +0000 (16:31 -0400)
commitfd31f2dd3730700d87c3b12a3ff509a50176a31f
treeca78568e1d56192df8ee34a07276d8826ee2812f
parent3eb5652b78fbe05e9502ff7bf09f1e5f872a297e
rgw: fix conflict with cloud sync

Signed-off-by: Casey Bodley <cbodley@redhat.com>
src/rgw/rgw_data_sync.cc