git.apps.os.sepia.ceph.com Git

]> git.apps.os.sepia.ceph.com Git - ceph.git/commit

author	Casey Bodley <cbodley@redhat.com>
	Mon, 12 Aug 2019 19:47:29 +0000 (15:47 -0400)
committer	Casey Bodley <cbodley@redhat.com>
	Tue, 13 Aug 2019 14:24:50 +0000 (10:24 -0400)
commit	75e1ec8a292ffe050420913f3ac664ca2e1b4220
tree	89345a9cd79419c34d9a06b65759d55a34b0a125	tree \| snapshot
parent	1937f74c332763c85453d5223d7e11269f9e3a09	commit \| diff
parent	2bf103100b364b3a55c8b75642eff79f60217c3f	commit \| diff

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

53 files changed:

src/librbd/api/Mirror.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/librgw.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/librgw_admin_user.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_admin.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_auth.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_auth.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_auth_registry.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_auth_s3.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_bucket.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_bucket.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_cache.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_common.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_coroutine.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_coroutine.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_cr_rados.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_data_sync.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_data_sync.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_dencoder.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_file.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_file.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_frontend.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_http_client.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_json_enc.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_lc.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_lc.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_log.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_main.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_metadata.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_object_expirer_core.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_object_expirer_core.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_quota.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_realm_reloader.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_reshard.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_reshard.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_sts.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_swift_auth.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_sync.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_sync.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_tools.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_user.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_user.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_worker.h	\|	diff2 \|	blob \| history
src/rgw/services/svc_notify.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/services/svc_notify.h	diff1 \|	diff2 \|	blob \| history
src/rgw/services/svc_sys_obj_cache.h	diff1 \|	diff2 \|	blob \| history
src/rgw/services/svc_sys_obj_core_types.h	\|	diff2 \|	blob \| history
src/rgw/services/svc_user_rados.cc	\|	diff2 \|	blob \| history
src/tools/rbd_mirror/ClusterWatcher.cc	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

src/librbd/api/Mirror.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/librgw.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/librgw_admin_user.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_admin.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_auth.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_auth.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_auth_registry.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_auth_s3.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_bucket.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_bucket.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_cache.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_common.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_coroutine.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_coroutine.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_cr_rados.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_data_sync.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_data_sync.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_dencoder.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_file.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_file.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_frontend.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_http_client.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_json_enc.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_lc.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_lc.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_log.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_main.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_metadata.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_object_expirer_core.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_object_expirer_core.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_op.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_quota.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_realm_reloader.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_reshard.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_reshard.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_s3.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rest_sts.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_swift_auth.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_sync.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_sync.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_tools.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_user.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_user.h	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_worker.h	\|	diff2 \|	blob \| history
src/rgw/services/svc_notify.cc	diff1 \|	diff2 \|	blob \| history
src/rgw/services/svc_notify.h	diff1 \|	diff2 \|	blob \| history
src/rgw/services/svc_sys_obj_cache.h	diff1 \|	diff2 \|	blob \| history
src/rgw/services/svc_sys_obj_core_types.h	\|	diff2 \|	blob \| history
src/rgw/services/svc_user_rados.cc	\|	diff2 \|	blob \| history
src/tools/rbd_mirror/ClusterWatcher.cc	diff1 \|	diff2 \|	blob \| history