Merge pull request #15267 from joscollin/wip-cleanup-redundant-headers-5

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

Thu, 1 Jun 2017 00:39:15 +0000 (10:39 +1000)

committer GitHub <noreply@github.com>

Thu, 1 Jun 2017 00:39:15 +0000 (10:39 +1000)
author Brad Hubbard <badone@users.noreply.github.com>
Thu, 1 Jun 2017 00:39:15 +0000 (10:39 +1000)
committer GitHub <noreply@github.com>
Thu, 1 Jun 2017 00:39:15 +0000 (10:39 +1000)
diff --cc src/common/admin_socket.cc
Simple merge
diff --cc src/common/buffer.cc
Simple merge
diff --cc src/common/ceph_context.cc
Simple merge
author	Brad Hubbard <badone@users.noreply.github.com>
	Thu, 1 Jun 2017 00:39:15 +0000 (10:39 +1000)
committer	GitHub <noreply@github.com>
	Thu, 1 Jun 2017 00:39:15 +0000 (10:39 +1000)
		1	2
src/common/admin_socket.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/buffer.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/ceph_context.cc	patch \|	diff1 \|	diff2 \|	blob \| history