Merge "Fix doc warning"

This commit is contained in:
Jenkins 2017-06-16 10:51:51 +00:00 committed by Gerrit Code Review
commit 10a67dfe9c

View File

@ -169,6 +169,7 @@ requirements it can be installed by:
apt-get install ansible apt-get install ansible
.. WARNING:: .. WARNING::
Kolla uses PBR in its implementation. PBR provides version information Kolla uses PBR in its implementation. PBR provides version information
to Kolla about the package in use. This information is later used when to Kolla about the package in use. This information is later used when
building images to specify the Docker tag used in the image built. When building images to specify the Docker tag used in the image built. When
@ -526,6 +527,7 @@ View the images.
docker images docker images
.. WARNING:: .. WARNING::
Mixing of OpenStack releases with Kolla releases (example, updating Mixing of OpenStack releases with Kolla releases (example, updating
kolla-build.conf to build Mitaka Keystone to be deployed with Newton Kolla) is kolla-build.conf to build Mitaka Keystone to be deployed with Newton Kolla) is
not recommended and will likely cause issues. not recommended and will likely cause issues.