Merge pull request #12597 from badone/wip-osdmap-nocopy

author Brad Hubbard <badone@users.noreply.github.com>

Sat, 24 Dec 2016 22:21:39 +0000 (08:21 +1000)

committer GitHub <noreply@github.com>

Sat, 24 Dec 2016 22:21:39 +0000 (08:21 +1000)
author Brad Hubbard <badone@users.noreply.github.com>
Sat, 24 Dec 2016 22:21:39 +0000 (08:21 +1000)
committer GitHub <noreply@github.com>
Sat, 24 Dec 2016 22:21:39 +0000 (08:21 +1000)
diff --cc src/mgr/PyModules.cc
Simple merge
diff --cc src/tools/ceph_objectstore_tool.cc
Simple merge
author	Brad Hubbard <badone@users.noreply.github.com>
	Sat, 24 Dec 2016 22:21:39 +0000 (08:21 +1000)
committer	GitHub <noreply@github.com>
	Sat, 24 Dec 2016 22:21:39 +0000 (08:21 +1000)
		1	2
src/mgr/PyModules.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/ceph_objectstore_tool.cc	patch \|	diff1 \|	diff2 \|	blob \| history