]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #28625 from zhangsw/rgw-fix-get-object
authorCasey Bodley <cbodley@users.noreply.github.com>
Mon, 25 Nov 2019 19:22:54 +0000 (14:22 -0500)
committerGitHub <noreply@github.com>
Mon, 25 Nov 2019 19:22:54 +0000 (14:22 -0500)
rgw: ignore If-Unmodified-Since if If-Match exists, and ignore If-Modified-Since if If-None-Match exists.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
src/rgw/rgw_rados.cc

Simple merge