Merge pull request #11086 from bassamtabbara/wip-ec-simd-runtime-detection

author Loic Dachary <loic@dachary.org>

Mon, 3 Oct 2016 09:43:29 +0000 (11:43 +0200)

committer GitHub <noreply@github.com>

Mon, 3 Oct 2016 09:43:29 +0000 (11:43 +0200)
author Loic Dachary <loic@dachary.org>
Mon, 3 Oct 2016 09:43:29 +0000 (11:43 +0200)
committer GitHub <noreply@github.com>
Mon, 3 Oct 2016 09:43:29 +0000 (11:43 +0200)
diff --cc src/ceph_osd.cc
Simple merge
diff --cc src/mon/OSDMonitor.cc
Simple merge
author	Loic Dachary <loic@dachary.org>
	Mon, 3 Oct 2016 09:43:29 +0000 (11:43 +0200)
committer	GitHub <noreply@github.com>
	Mon, 3 Oct 2016 09:43:29 +0000 (11:43 +0200)
		1	2
src/ceph_osd.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/OSDMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history