diff options
| author | Sage Weil <sage@redhat.com> | 2015-03-10 14:24:59 +0100 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2015-03-10 14:24:59 +0100 |
| commit | faa1f2741c0f287af5909e95bf202da3778092da (patch) | |
| tree | f9372fec5bf5bfcc2263a6da120f86ad222a205b /src/rgw/rgw_main.cc | |
| parent | Merge pull request #3901 from dachary/wip-10922-ceph-deploy-documentation (diff) | |
| parent | Merge pull request #3917 from dachary/wip-rhel6-doc (diff) | |
| download | ceph-faa1f2741c0f287af5909e95bf202da3778092da.tar.xz ceph-faa1f2741c0f287af5909e95bf202da3778092da.zip | |
Merge remote-tracking branch 'gh/hammer'
Conflicts:
src/gmock
Diffstat (limited to 'src/rgw/rgw_main.cc')
| -rw-r--r-- | src/rgw/rgw_main.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc index 81a2d33ae8b..f4ef88e027c 100644 --- a/src/rgw/rgw_main.cc +++ b/src/rgw/rgw_main.cc @@ -1083,7 +1083,7 @@ int main(int argc, const char **argv) if (r) return 1; - rgw_user_init(store->meta_mgr); + rgw_user_init(store); rgw_bucket_init(store->meta_mgr); rgw_log_usage_init(g_ceph_context, store); |