Files
docs/doc/source/_includes/distributed-upgrade-orchestration-process-using-the-cli.rest
Ron Stone 5e8ef28507 Resolve merge conflicts.
This review is for merge conflicts between abandoned
https://review.opendev.org/c/starlingx/docs/+/797943
and
https://review.opendev.org/c/starlingx/docs/+/797948
and replaces those updates.

Signed-off-by: Ron Stone <ronald.stone@windriver.com>
Change-Id: Ibb386daeb633606a50b1444d95cdc95dea21959b
2021-06-28 15:52:32 -04:00

6 lines
81 B
ReStructuredText

.. syscontroller-begin
.. syscontroller-end
.. dcupgrade-begin
.. dcupgrade-end