]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #13871 from smithfarm/wip-19162-kraken
authorNathan Cutler <presnypreklad@gmail.com>
Mon, 31 Jul 2017 10:32:45 +0000 (12:32 +0200)
committerGitHub <noreply@github.com>
Mon, 31 Jul 2017 10:32:45 +0000 (12:32 +0200)
kraken: rgw: rgw_file: fix marker computation

1  2 
src/common/config_opts.h
src/rgw/rgw_file.cc

Simple merge
Simple merge