diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-05-12 13:58:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-05-12 13:58:04 +0000 |
| commit | f54a372bd7fcb2aab0e02fa97fa1b5ef9ae815a7 (patch) | |
| tree | fb604b27bf521cde4b8c938a604536ab4aca68f9 | |
| parent | 801d3a0b8300020fe9ef9b49459129b4f204b12e (diff) | |
| parent | 1c19bab564c87ed70937b252b7dfee7d8c6f2a68 (diff) | |
Merge "docs: FIXME: Silence compatible hardware list." into stable/brahmaputra
| -rw-r--r-- | docs/installation-instruction.rst | 4 | ||||
| -rw-r--r-- | docs/release-notes.rst | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/docs/installation-instruction.rst b/docs/installation-instruction.rst index aa4cbdb7..9ba3695d 100644 --- a/docs/installation-instruction.rst +++ b/docs/installation-instruction.rst @@ -143,8 +143,6 @@ Help with Hardware Requirements Calculate hardware requirements: -For information on compatible hardware types available for use, please see *Reference: 11*. - When choosing the hardware on which you will deploy your OpenStack environment, you should think about: @@ -636,7 +634,7 @@ Fuel 11) `Fuel Plugin Developers Guide <https://wiki.openstack.org/wiki/Fuel/Plugins>`_ -12) `Fuel OpenStack Hardware Compatibility List <https://www.mirantis.com/products/openstack-drivers-and-plugins/hardware-compatibility-list>`_ +12) `(N/A on AArch64) Fuel OpenStack Hardware Compatibility List <https://www.mirantis.com/products/openstack-drivers-and-plugins/hardware-compatibility-list>`_ Fuel in OPNFV ------------- diff --git a/docs/release-notes.rst b/docs/release-notes.rst index ed04c619..fa325fdc 100644 --- a/docs/release-notes.rst +++ b/docs/release-notes.rst @@ -247,7 +247,7 @@ Fuel 11) `Fuel Plugin Developers Guide <https://wiki.openstack.org/wiki/Fuel/Plugins>`_ -12) `Fuel OpenStack Hardware Compatibility List <https://www.mirantis.com/products/openstack-drivers-and-plugins/hardware-compatibility-list>`_ +12) `(N/A on AArch64) Fuel OpenStack Hardware Compatibility List <https://www.mirantis.com/products/openstack-drivers-and-plugins/hardware-compatibility-list>`_ Fuel in OPNFV ------------- |