opentelekomcloud-docs / elastic-cloud-server

Open Telekom Cloud Elastic Cloud Server docs
Apache License 2.0
3 stars 4 forks source link

Propagate changes to elastic-cloud-server-api-ref from PreProd environment #133

Closed otcbot[bot] closed 1 year ago

otcbot[bot] commented 1 year ago

This is an automatically created Pull Request for changes to elastic-cloud-server-api-ref to promote changes down the pipeline to Production environment.

The original change can be found under https://gitea.eco.tsi-dev.otc-service.com/docs/elastic-cloud-server/pulls/184.

There were patch conflicts, please review original patch file.

otcbot[bot] commented 1 year ago

I tried my best, but could not apply the patch as is, therefore I will report you what I could not apply.

BTW, if in the diff you see removed line equal to the added line it may be caused by invisible trailing spaces. This is safe to ignore.

In most cases content of the patch remainder need to be carefully analyzed and necessary changes applied manually.

Following is the patch remainder:

diff a/umn/source/change_history.rst b/umn/source/change_history.rst    (rejected hunks)
@@ -10,6 +10,10 @@ Change History
 +===================================+======================================================================================================================================================================================================================================================================================+
 | 2023-06-27                        | Added :ref:`Key Operations Supported by CTS <en-us_topic_0116262067>`.                                                                                                                                                                                                               |
 +-----------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
+| 2023-06-13                        | Modified the following content:                                                                                                                                                                                                                                                      |
+|                                   |                                                                                                                                                                                                                                                                                      |
+|                                   | -  Added G7 ECSs in :ref:`GPU-accelerated ECSs <en-us_topic_0097289624>`.                                                                                                                                                                                                            |
++-----------------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | 2023-05-10                        | Modified the following content:                                                                                                                                                                                                                                                      |
 |                                   |                                                                                                                                                                                                                                                                                      |
 |                                   | -  Added the following I3 flavors in :ref:`Ultra-high I/O ECSs <en-us_topic_0094118976>`: i3.2xlarge.8, i3.4xlarge.8, i3.8xlarge.8, i3.12xlarge.8, and i3.16xlarge.8.                                                                                                                |
diff a/umn/source/service_overview/ecs_specifications_and_types/gpu-accelerated_ecss.rst b/umn/source/service_overview/ecs_specifications_and_types/gpu-accelerated_ecss.rst    (rejected hunks)
@@ -574,16 +652,11 @@ P1 ECSs are used in computing acceleration scenarios, such as deep learning trai

 -  P1 ECSs do not support specifications modification.

--  P1 ECSs do not support automatic recovery.
-
-   -  If the host is faulty or subhealthy, you need to stop the ECS for hardware repair.
-   -  In case of system maintenance or hardware faults, the ECS will be redeployed (to ensure HA) and cold migrated to another host. The local disk data of the ECS will not be retained.
-
--  :ref:`Table 11 <en-us_topic_0097289624__table8704181020556>` lists the OSs supported by P1 ECSs.
+-  :ref:`Table 12 <en-us_topic_0097289624__table8704181020556>` lists the OSs supported by P1 ECSs.

    .. _en-us_topic_0097289624__table8704181020556:

-   .. table:: **Table 11** Supported OS versions
+   .. table:: **Table 12** Supported OS versions

       +-----------------------------------+---------------------------------------+
       | OS                                | Version                               |
otc-zuul[bot] commented 1 year ago

Build succeeded. https://zuul.otc-service.com/t/eco/buildset/e8a4514ec9e641a7b95ca254cb5652ad

:heavy_check_mark: noop SUCCESS in 0s :heavy_check_mark: otc-tox-docs SUCCESS in 13m 36s :heavy_check_mark: build-otc-umn SUCCESS in 7m 41s