Merge pull request #12227 from ceph/wip-orit-resharding-hammer

author Orit Wasserman <owasserm@redhat.com>

Sun, 8 Jan 2017 07:26:03 +0000 (09:26 +0200)

committer GitHub <noreply@github.com>

Sun, 8 Jan 2017 07:26:03 +0000 (09:26 +0200)
author Orit Wasserman <owasserm@redhat.com>
Sun, 8 Jan 2017 07:26:03 +0000 (09:26 +0200)
committer GitHub <noreply@github.com>
Sun, 8 Jan 2017 07:26:03 +0000 (09:26 +0200)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
author	Orit Wasserman <owasserm@redhat.com>
	Sun, 8 Jan 2017 07:26:03 +0000 (09:26 +0200)
committer	GitHub <noreply@github.com>
	Sun, 8 Jan 2017 07:26:03 +0000 (09:26 +0200)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	patch \|	diff1 \|	diff2 \|	blob \| history