]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #21425 from cbodley/wip-rgw-fix-set_threaded
authorMatt Benjamin <mbenjamin@redhat.com>
Fri, 13 Apr 2018 20:37:03 +0000 (16:37 -0400)
committerGitHub <noreply@github.com>
Fri, 13 Apr 2018 20:37:03 +0000 (16:37 -0400)
rgw: fix sync status conflict with cloud sync


Trivial merge