Merge pull request #21311 from liewegas/wip-validate-caps

author Gregory Farnum <greg@gregs42.com>

Wed, 11 Apr 2018 18:14:37 +0000 (11:14 -0700)

committer GitHub <noreply@github.com>

Wed, 11 Apr 2018 18:14:37 +0000 (11:14 -0700)
author Gregory Farnum <greg@gregs42.com>
Wed, 11 Apr 2018 18:14:37 +0000 (11:14 -0700)
committer GitHub <noreply@github.com>
Wed, 11 Apr 2018 18:14:37 +0000 (11:14 -0700)
diff --cc src/mon/AuthMonitor.cc
Simple merge
diff --cc src/mon/AuthMonitor.h
Simple merge
author	Gregory Farnum <greg@gregs42.com>
	Wed, 11 Apr 2018 18:14:37 +0000 (11:14 -0700)
committer	GitHub <noreply@github.com>
	Wed, 11 Apr 2018 18:14:37 +0000 (11:14 -0700)
		1	2
src/mon/AuthMonitor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/mon/AuthMonitor.h	patch \|	diff1 \|	diff2 \|	blob \| history