Merge pull request #4143 from majianpeng/ec-notsupp-omap

author Samuel Just <sam.just@inktank.com>

Fri, 10 Jul 2015 00:12:28 +0000 (17:12 -0700)

committer Samuel Just <sam.just@inktank.com>

Fri, 10 Jul 2015 00:12:28 +0000 (17:12 -0700)
author Samuel Just <sam.just@inktank.com>
Fri, 10 Jul 2015 00:12:28 +0000 (17:12 -0700)
committer Samuel Just <sam.just@inktank.com>
Fri, 10 Jul 2015 00:12:28 +0000 (17:12 -0700)
diff --cc src/osd/ReplicatedPG.cc
Simple merge
diff --cc src/osd/osd_types.h
Simple merge
author	Samuel Just <sam.just@inktank.com>
	Fri, 10 Jul 2015 00:12:28 +0000 (17:12 -0700)
committer	Samuel Just <sam.just@inktank.com>
	Fri, 10 Jul 2015 00:12:28 +0000 (17:12 -0700)
		1	2
src/osd/ReplicatedPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history