Merge pull request #14821 from badone/wip-no-death-coredumps

author Yuri Weinstein <yuri.weinstein@gmail.com>

Tue, 2 May 2017 16:05:32 +0000 (09:05 -0700)

committer GitHub <noreply@github.com>

Tue, 2 May 2017 16:05:32 +0000 (09:05 -0700)
author Yuri Weinstein <yuri.weinstein@gmail.com>
Tue, 2 May 2017 16:05:32 +0000 (09:05 -0700)
committer GitHub <noreply@github.com>
Tue, 2 May 2017 16:05:32 +0000 (09:05 -0700)
diff --cc src/test/objectstore/store_test.cc
Simple merge
diff --cc src/test/osd/types.cc
Simple merge
author	Yuri Weinstein <yuri.weinstein@gmail.com>
	Tue, 2 May 2017 16:05:32 +0000 (09:05 -0700)
committer	GitHub <noreply@github.com>
	Tue, 2 May 2017 16:05:32 +0000 (09:05 -0700)
		1	2
src/test/objectstore/store_test.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/osd/types.cc	patch \|	diff1 \|	diff2 \|	blob \| history