Merge pull request #15364 from joscollin/wip-cleanup-putto-operator-const

author Sage Weil <sage@newdream.net>

Thu, 1 Jun 2017 16:52:57 +0000 (11:52 -0500)

committer GitHub <noreply@github.com>

Thu, 1 Jun 2017 16:52:57 +0000 (11:52 -0500)
author Sage Weil <sage@newdream.net>
Thu, 1 Jun 2017 16:52:57 +0000 (11:52 -0500)
committer GitHub <noreply@github.com>
Thu, 1 Jun 2017 16:52:57 +0000 (11:52 -0500)
diff --cc src/include/buffer.h
Simple merge
diff --cc src/mon/MonCap.cc
Simple merge
author	Sage Weil <sage@newdream.net>
	Thu, 1 Jun 2017 16:52:57 +0000 (11:52 -0500)
committer	GitHub <noreply@github.com>
	Thu, 1 Jun 2017 16:52:57 +0000 (11:52 -0500)
		1	2
src/include/buffer.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/MonCap.cc	patch \|	diff1 \|	diff2 \|	blob \| history