Merge pull request #13070 from cbodley/wip-rgw-meta-sync-periods

author Yehuda Sadeh <yehuda@redhat.com>

Wed, 26 Apr 2017 16:29:26 +0000 (09:29 -0700)

committer GitHub <noreply@github.com>

Wed, 26 Apr 2017 16:29:26 +0000 (09:29 -0700)
author Yehuda Sadeh <yehuda@redhat.com>
Wed, 26 Apr 2017 16:29:26 +0000 (09:29 -0700)
committer GitHub <noreply@github.com>
Wed, 26 Apr 2017 16:29:26 +0000 (09:29 -0700)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/rgw/rgw_admin.cc
Simple merge
author	Yehuda Sadeh <yehuda@redhat.com>
	Wed, 26 Apr 2017 16:29:26 +0000 (09:29 -0700)
committer	GitHub <noreply@github.com>
	Wed, 26 Apr 2017 16:29:26 +0000 (09:29 -0700)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history