Merge pull request #16648 from ovh/bp-kill-str-conv

author Sage Weil <sage@newdream.net>

Thu, 10 Aug 2017 16:19:24 +0000 (11:19 -0500)

committer GitHub <noreply@github.com>

Thu, 10 Aug 2017 16:19:24 +0000 (11:19 -0500)
author Sage Weil <sage@newdream.net>
Thu, 10 Aug 2017 16:19:24 +0000 (11:19 -0500)
committer GitHub <noreply@github.com>
Thu, 10 Aug 2017 16:19:24 +0000 (11:19 -0500)
diff --cc src/objclass/class_api.cc
Simple merge
diff --cc src/osdc/Objecter.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 10 Aug 2017 16:19:24 +0000 (11:19 -0500)
committer	GitHub <noreply@github.com>
	Thu, 10 Aug 2017 16:19:24 +0000 (11:19 -0500)
		1	2
src/objclass/class_api.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osdc/Objecter.h	patch \|	diff1 \|	diff2 \|	blob \| history