Merge pull request #10509 from yehudasa/wip-15557-hammer

author Orit Wasserman <owasserm@redhat.com>

Sat, 13 Aug 2016 16:22:19 +0000 (18:22 +0200)

committer GitHub <noreply@github.com>

Sat, 13 Aug 2016 16:22:19 +0000 (18:22 +0200)
author Orit Wasserman <owasserm@redhat.com>
Sat, 13 Aug 2016 16:22:19 +0000 (18:22 +0200)
committer GitHub <noreply@github.com>
Sat, 13 Aug 2016 16:22:19 +0000 (18:22 +0200)
diff --cc src/rgw/rgw_rados.cc
Simple merge
diff --cc src/rgw/rgw_rados.h
Simple merge
author	Orit Wasserman <owasserm@redhat.com>
	Sat, 13 Aug 2016 16:22:19 +0000 (18:22 +0200)
committer	GitHub <noreply@github.com>
	Sat, 13 Aug 2016 16:22:19 +0000 (18:22 +0200)
		1	2
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.h	patch \|	diff1 \|	diff2 \|	blob \| history