M #-: Fix merges for 5.8.4 RNs

Author: tinova

source/deployment/sunstone_setup/sunstone.rst

@@ -131,13 +131,7 @@ Available options are:
 +---------------------------+-----------------------------------------------------------------------------------------------+
 | :allow\_vnc\_federation   | True to display VNC icons in fedetarion                                                       |
 +---------------------------+-----------------------------------------------------------------------------------------------+
-<<<<<<< HEAD
 
-.. note:: To use Sunstone with IPv6 only systems and thin HTTP sever, use the full IPv6 address in the field `:host`. If you need to set the localhost address (::1) or the unspecified address (::) please use the following:
-
-          Example: :host: 0::1, :host: 0::0
-=======
->>>>>>> one-5.8-maintenance
 
 .. note:: To use Sunstone with IPv6 only systems and thin HTTP sever, use the full IPv6 address in the field `:host`. If you need to set the localhost address (::1) or the unspecified address (::) please use the following:
 

source/intro_release_notes/index.rst

@@ -9,9 +9,5 @@ Introduction and Release Notes
 
    Concepts and Terminology <concepts_terminology/index>
    Release Notes 5.8.1 <release_notes/index>
-<<<<<<< HEAD
-   Release Notes 5.8.3 Hotfix <release_notes_hotfix/index>
-=======
    Release Notes 5.8.4 Hotfix <release_notes_hotfix/index>
->>>>>>> one-5.8-maintenance
    Upgrades <upgrades/index>

source/intro_release_notes/release_notes_hotfix/index.rst

@@ -1,11 +1,7 @@
 .. _rn_hotfix:
 
 ================================================================================
-<<<<<<< HEAD
-Release Notes 5.8.3 Hotfix
-=======
 Release Notes 5.8.4 Hotfix
->>>>>>> one-5.8-maintenance
 ================================================================================
 
 .. toctree::
@@ -14,8 +10,5 @@ Release Notes 5.8.4 Hotfix
    What is? <what_is_hotfix>
    Resolved Issues in 5.8.2 <resolved_issues_582>
    Resolved Issues in 5.8.3 <resolved_issues_583>
-<<<<<<< HEAD
-=======
    Resolved Issues in 5.8.4 <resolved_issues_584>
->>>>>>> one-5.8-maintenance
    Known Issues <known_issues_hotfix>

source/intro_release_notes/release_notes_hotfix/known_issues_hotfix.rst

@@ -78,26 +78,6 @@ LOCK mark for VMs in Sunstone
 There is a bug which makes disappear the LOCK highlight for VMs in Sunstone. This bug has been fixed but to let the fix take effect it's necessary to force a VM DB update. You can trigger this update with a state change or a template update without modifying any field.
 
 This is only necessary when updating to 5.8.2 from 5.8.x.
-<<<<<<< HEAD
-
-FSCK network problem
-================================================================================
-
-There are two bugs affecting the onedb fsck command related to networks. These bugs have been fixed, so please replace your fsck/network.rb file (located in /usr/lib/one/ruby/onedb/fsck) by https://github.com/OpenNebula/one/blob/master/src/onedb/fsck/network.rb
-
-DB Size Increase due to FTS index
-=================================
-
-FTS index used for VM searching is consuming too much disk size.
-
-In order to remove the index while a new release reduces the indexing and alleviates the issue, run the following SQL sentence in your MySQL OpenNebula DB:
-
-.. code::
-
-   ALTER TABLE vm_pool DROP INDEX ftidx;
-
-
-More information can be found `here <https://github.com/OpenNebula/one/issues/3393>`__.
 
 Sunstone Disk Update for vCenter
 ================================
@@ -114,5 +94,3 @@ Using some CLI commands in Ubuntu 18.04, due to ruby and gems version, you may s
 `warning: constant ::Fixnum is deprecated`
 
 As a workaround you can use `export RUBYOPT="-W0`, this will disable the warning message (but, take in account that it will disable all warning messages from ruby)
-=======
->>>>>>> one-5.8-maintenance