Merge pull request #10658 from dachary/wip-16862-jewel

author Orit Wasserman <owasserm@redhat.com>

Fri, 26 Aug 2016 08:28:10 +0000 (10:28 +0200)

committer GitHub <noreply@github.com>

Fri, 26 Aug 2016 08:28:10 +0000 (10:28 +0200)
author Orit Wasserman <owasserm@redhat.com>
Fri, 26 Aug 2016 08:28:10 +0000 (10:28 +0200)
committer GitHub <noreply@github.com>
Fri, 26 Aug 2016 08:28:10 +0000 (10:28 +0200)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
author	Orit Wasserman <owasserm@redhat.com>
	Fri, 26 Aug 2016 08:28:10 +0000 (10:28 +0200)
committer	GitHub <noreply@github.com>
	Fri, 26 Aug 2016 08:28:10 +0000 (10:28 +0200)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	patch \|	diff1 \|	diff2 \|	blob \| history