diff options
| author | Casey Bodley <cbodley@redhat.com> | 2019-08-12 21:47:29 +0200 |
|---|---|---|
| committer | Casey Bodley <cbodley@redhat.com> | 2019-08-13 16:24:50 +0200 |
| commit | 75e1ec8a292ffe050420913f3ac664ca2e1b4220 (patch) | |
| tree | 89345a9cd79419c34d9a06b65759d55a34b0a125 /src/rgw/rgw_file.cc | |
| parent | Merge pull request #29605 from yaozongyou/remove-unused-marco (diff) | |
| parent | rgw: RGWUserCtl::PutParams::attrs defaults to nullptr (diff) | |
| download | ceph-75e1ec8a292ffe050420913f3ac664ca2e1b4220.tar.xz ceph-75e1ec8a292ffe050420913f3ac664ca2e1b4220.zip | |
Merge branch 'wip-rgw-metadata-servicification'
Conflicts:
src/rgw/rgw_auth.cc
src/rgw/rgw_auth_registry.h
src/rgw/rgw_auth_s3.h
src/rgw/rgw_bucket.cc
src/rgw/rgw_bucket.h
src/rgw/rgw_data_sync.h
src/rgw/rgw_frontend.h
src/rgw/rgw_log.h
src/rgw/rgw_main.cc
src/rgw/rgw_rados.cc
src/rgw/rgw_rados.h
src/rgw/rgw_rest_s3.h
src/rgw/rgw_rest_sts.h
src/rgw/rgw_swift_auth.h
src/rgw/rgw_user.cc
src/rgw/rgw_user.h
src/rgw/services/svc_sys_obj_core.h
Diffstat (limited to 'src/rgw/rgw_file.cc')
| -rw-r--r-- | src/rgw/rgw_file.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rgw/rgw_file.cc b/src/rgw/rgw_file.cc index da6c487a2b4..df533e9425d 100644 --- a/src/rgw/rgw_file.cc +++ b/src/rgw/rgw_file.cc @@ -29,6 +29,8 @@ #include "rgw_perf_counters.h" #include "common/errno.h" +#include "services/svc_zone.h" + #include <atomic> #define dout_subsys ceph_subsys_rgw |