Merge pull request #15788 from vshankar/mirror-ha-poolwatcher-policy

author Jason Dillaman <dillaman@redhat.com>

Thu, 16 Nov 2017 01:24:32 +0000 (20:24 -0500)

committer GitHub <noreply@github.com>

Thu, 16 Nov 2017 01:24:32 +0000 (20:24 -0500)
author Jason Dillaman <dillaman@redhat.com>
Thu, 16 Nov 2017 01:24:32 +0000 (20:24 -0500)
committer GitHub <noreply@github.com>
Thu, 16 Nov 2017 01:24:32 +0000 (20:24 -0500)
diff --cc src/common/options.cc
Simple merge
diff --cc src/test/encoding/types.h
Simple merge
author	Jason Dillaman <dillaman@redhat.com>
	Thu, 16 Nov 2017 01:24:32 +0000 (20:24 -0500)
committer	GitHub <noreply@github.com>
	Thu, 16 Nov 2017 01:24:32 +0000 (20:24 -0500)
		1	2
src/common/options.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/test/encoding/types.h	patch \|	diff1 \|	diff2 \|	blob \| history