Merge pull request #19362 from myoungwon/wip-manifest-rados-op-promote

author Sage Weil <sage@newdream.net>

Mon, 22 Jan 2018 14:21:24 +0000 (08:21 -0600)

committer GitHub <noreply@github.com>

Mon, 22 Jan 2018 14:21:24 +0000 (08:21 -0600)
author Sage Weil <sage@newdream.net>
Mon, 22 Jan 2018 14:21:24 +0000 (08:21 -0600)
committer GitHub <noreply@github.com>
Mon, 22 Jan 2018 14:21:24 +0000 (08:21 -0600)
diff --cc src/include/rados/librados.hpp
Simple merge
diff --cc src/librados/librados.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.cc
Simple merge
diff --cc src/osd/PrimaryLogPG.h
Simple merge
author	Sage Weil <sage@newdream.net>
	Mon, 22 Jan 2018 14:21:24 +0000 (08:21 -0600)
committer	GitHub <noreply@github.com>
	Mon, 22 Jan 2018 14:21:24 +0000 (08:21 -0600)
		1	2
src/include/rados/librados.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/librados/librados.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/osd/PrimaryLogPG.h	patch \|	diff1 \|	diff2 \|	blob \| history