Merge pull request #20147 from smithfarm/wip-15904

author Gregory Farnum <greg@gregs42.com>

Tue, 13 Feb 2018 17:07:24 +0000 (09:07 -0800)

committer GitHub <noreply@github.com>

Tue, 13 Feb 2018 17:07:24 +0000 (09:07 -0800)
author Gregory Farnum <greg@gregs42.com>
Tue, 13 Feb 2018 17:07:24 +0000 (09:07 -0800)
committer GitHub <noreply@github.com>
Tue, 13 Feb 2018 17:07:24 +0000 (09:07 -0800)
diff --cc PendingReleaseNotes
Simple merge
diff --cc src/tools/rados/rados.cc
Simple merge
author	Gregory Farnum <greg@gregs42.com>
	Tue, 13 Feb 2018 17:07:24 +0000 (09:07 -0800)
committer	GitHub <noreply@github.com>
	Tue, 13 Feb 2018 17:07:24 +0000 (09:07 -0800)
		1	2
PendingReleaseNotes	patch \|	diff1 \|	diff2 \|	blob \| history
src/tools/rados/rados.cc	patch \|	diff1 \|	diff2 \|	blob \| history