Merge pull request #14509 from smithfarm/wip-18499-kraken

author Nathan Cutler <presnypreklad@gmail.com>

Fri, 7 Jul 2017 07:48:57 +0000 (09:48 +0200)

committer GitHub <noreply@github.com>

Fri, 7 Jul 2017 07:48:57 +0000 (09:48 +0200)
author Nathan Cutler <presnypreklad@gmail.com>
Fri, 7 Jul 2017 07:48:57 +0000 (09:48 +0200)
committer GitHub <noreply@github.com>
Fri, 7 Jul 2017 07:48:57 +0000 (09:48 +0200)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
author	Nathan Cutler <presnypreklad@gmail.com>
	Fri, 7 Jul 2017 07:48:57 +0000 (09:48 +0200)
committer	GitHub <noreply@github.com>
	Fri, 7 Jul 2017 07:48:57 +0000 (09:48 +0200)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	patch \|	diff1 \|	diff2 \|	blob \| history