Merge pull request #5384 from dachary/wip-12502-hammer

author Loic Dachary <loic@dachary.org>

Tue, 4 Aug 2015 10:34:18 +0000 (12:34 +0200)

committer Loic Dachary <loic@dachary.org>

Tue, 4 Aug 2015 10:34:18 +0000 (12:34 +0200)
author Loic Dachary <loic@dachary.org>
Tue, 4 Aug 2015 10:34:18 +0000 (12:34 +0200)
committer Loic Dachary <loic@dachary.org>
Tue, 4 Aug 2015 10:34:18 +0000 (12:34 +0200)
diff --cc src/rgw/rgw_admin.cc
Simple merge
diff --cc src/rgw/rgw_rados.cc
Simple merge
author	Loic Dachary <loic@dachary.org>
	Tue, 4 Aug 2015 10:34:18 +0000 (12:34 +0200)
committer	Loic Dachary <loic@dachary.org>
	Tue, 4 Aug 2015 10:34:18 +0000 (12:34 +0200)
		1	2
src/rgw/rgw_admin.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/rgw/rgw_rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history