Merge "Allows domain name to be configured"

author Tim Rozet <trozet@redhat.com>

Fri, 11 Sep 2015 21:48:59 +0000 (21:48 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Fri, 11 Sep 2015 21:48:59 +0000 (21:48 +0000)
author Tim Rozet <trozet@redhat.com>
Fri, 11 Sep 2015 21:48:59 +0000 (21:48 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Fri, 11 Sep 2015 21:48:59 +0000 (21:48 +0000)
diff --cc foreman/ci/deploy.sh
Simple merge
diff --cc foreman/ci/opnfv_ksgen_settings.yml
Simple merge
diff --cc foreman/ci/opnfv_ksgen_settings_no_HA.yml
Simple merge
author	Tim Rozet <trozet@redhat.com>
	Fri, 11 Sep 2015 21:48:59 +0000 (21:48 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Fri, 11 Sep 2015 21:48:59 +0000 (21:48 +0000)
		1	2
foreman/ci/deploy.sh	patch \|	diff1 \|	diff2 \|	blob \| history
foreman/ci/opnfv_ksgen_settings.yml	patch \|	diff1 \|	diff2 \|	blob \| history
foreman/ci/opnfv_ksgen_settings_no_HA.yml	patch \|	diff1 \|	diff2 \|	blob \| history