]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #16448 from linuxbox2/wip-supriti-ord
authorCasey Bodley <cbodley@users.noreply.github.com>
Fri, 21 Jul 2017 14:11:46 +0000 (10:11 -0400)
committerGitHub <noreply@github.com>
Fri, 21 Jul 2017 14:11:46 +0000 (10:11 -0400)
rgw_file: properly & |'d flags

Reviewed-by: Casey Bodley <cbodley@redhat.com>
1  2 
src/common/cohort_lru.h

Simple merge