Merge "Document available deployment options" into stable/colorado

author Tim Rozet <trozet@redhat.com>

Tue, 20 Sep 2016 20:30:47 +0000 (20:30 +0000)

committer Gerrit Code Review <gerrit@172.30.200.206>

Tue, 20 Sep 2016 20:30:47 +0000 (20:30 +0000)
author Tim Rozet <trozet@redhat.com>
Tue, 20 Sep 2016 20:30:47 +0000 (20:30 +0000)
committer Gerrit Code Review <gerrit@172.30.200.206>
Tue, 20 Sep 2016 20:30:47 +0000 (20:30 +0000)
diff --cc docs/installationprocedure/baremetal.rst
Simple merge
author	Tim Rozet <trozet@redhat.com>
	Tue, 20 Sep 2016 20:30:47 +0000 (20:30 +0000)
committer	Gerrit Code Review <gerrit@172.30.200.206>
	Tue, 20 Sep 2016 20:30:47 +0000 (20:30 +0000)