Merge pull request #14698 from smithfarm/wip-19677-jewel

author John Spray <jspray@redhat.com>

Tue, 13 Jun 2017 18:05:55 +0000 (19:05 +0100)

committer GitHub <noreply@github.com>

Tue, 13 Jun 2017 18:05:55 +0000 (19:05 +0100)
author John Spray <jspray@redhat.com>
Tue, 13 Jun 2017 18:05:55 +0000 (19:05 +0100)
committer GitHub <noreply@github.com>
Tue, 13 Jun 2017 18:05:55 +0000 (19:05 +0100)
diff --cc src/client/Client.cc
Simple merge
diff --cc src/common/config_opts.h
Simple merge
author	John Spray <jspray@redhat.com>
	Tue, 13 Jun 2017 18:05:55 +0000 (19:05 +0100)
committer	GitHub <noreply@github.com>
	Tue, 13 Jun 2017 18:05:55 +0000 (19:05 +0100)
		1	2
src/client/Client.cc	patch \|	diff1 \|	diff2 \|	blob \| history
src/common/config_opts.h	patch \|	diff1 \|	diff2 \|	blob \| history