Merge pull request #14787 from linuxbox2/jewel-rgw-shard-limit-ck

author Abhishek L <abhishek.lekshmanan@gmail.com>

Fri, 9 Jun 2017 17:38:46 +0000 (19:38 +0200)

committer GitHub <noreply@github.com>

Fri, 9 Jun 2017 17:38:46 +0000 (19:38 +0200)
author Abhishek L <abhishek.lekshmanan@gmail.com>
Fri, 9 Jun 2017 17:38:46 +0000 (19:38 +0200)
committer GitHub <noreply@github.com>
Fri, 9 Jun 2017 17:38:46 +0000 (19:38 +0200)
diff --cc src/common/config_opts.h
Simple merge
diff --cc src/rgw/rgw_admin.cc
Simple merge
author	Abhishek L <abhishek.lekshmanan@gmail.com>
	Fri, 9 Jun 2017 17:38:46 +0000 (19:38 +0200)
committer	GitHub <noreply@github.com>
	Fri, 9 Jun 2017 17:38:46 +0000 (19:38 +0200)
		1	2
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history