Merge pull request #19935 from myoungwon/wip-manifest-ref-count

author Kefu Chai <tchaikov@gmail.com>

Sun, 15 Apr 2018 14:52:22 +0000 (22:52 +0800)

committer GitHub <noreply@github.com>

Sun, 15 Apr 2018 14:52:22 +0000 (22:52 +0800)
author Kefu Chai <tchaikov@gmail.com>
Sun, 15 Apr 2018 14:52:22 +0000 (22:52 +0800)
committer GitHub <noreply@github.com>
Sun, 15 Apr 2018 14:52:22 +0000 (22:52 +0800)
diff --cc src/osd/osd_types.h
Simple merge
diff --cc src/tools/rados/rados.cc
Simple merge
author	Kefu Chai <tchaikov@gmail.com>
	Sun, 15 Apr 2018 14:52:22 +0000 (22:52 +0800)
committer	GitHub <noreply@github.com>
	Sun, 15 Apr 2018 14:52:22 +0000 (22:52 +0800)
		1	2
src/osd/osd_types.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rados/rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history