]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #21439 from oritwas/wip-rgw-librgwadmin
authorOrit Wasserman <owasserm@redhat.com>
Wed, 23 May 2018 14:25:04 +0000 (17:25 +0300)
committerGitHub <noreply@github.com>
Wed, 23 May 2018 14:25:04 +0000 (17:25 +0300)
new librgw_admin_us

1  2 
src/rgw/CMakeLists.txt
src/rgw/rgw_user.h
src/test/CMakeLists.txt

index 0f08129c57ce6fc89724e621799bf3a82c8ab247,cca10b2be17c9d9f1f0fa95429269fa2d7a9d8ee..da273923772b03ca26fd4f14e8c16cc7a7545788
@@@ -92,16 -82,14 +82,13 @@@ set(librgw_common_src
    rgw_cr_rest.cc
    rgw_object_expirer_core.cc
    rgw_op.cc
-   rgw_os_lib.cc
+   rgw_otp.cc
    rgw_policy_s3.cc
-   rgw_process.cc
    rgw_quota.cc
    rgw_rados.cc
 -  rgw_request.cc
    rgw_resolve.cc
-   rgw_rest_bucket.cc
    rgw_rest.cc
    rgw_rest_client.cc
-   rgw_rest_config.cc
    rgw_rest_conn.cc
    rgw_rest_log.cc
    rgw_rest_metadata.cc
Simple merge
Simple merge