opentelekomcloud-docs / relational-database-service

Open Telekom Cloud Relational Database Service docs
Apache License 2.0
0 stars 0 forks source link

Propagate changes to relational-database-service-api-ref from PreProd environment #51

Closed otcbot[bot] closed 3 months ago

otcbot[bot] commented 5 months ago

This is an automatically created Pull Request for changes to relational-database-service-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/relational-database-service/pulls/85.

There were patch conflicts, please review original patch file.

otcbot[bot] commented 5 months 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)
@@ -8,6 +8,10 @@ Change History
 +-----------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | Released On                       | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 +===================================+============================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================+
+| 2024-03-22                        | Modified the following content:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+|                                   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+|                                   | Supported Extreme SSD.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
++-----------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | 2024-02-01                        | Modified the following content:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 |                                   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 |                                   | Supported PostgreSQL 15.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   |
diff a/umn/source/working_with_rds_for_sql_server/task_center/viewing_a_task.rst b/umn/source/working_with_rds_for_sql_server/task_center/viewing_a_task.rst    (rejected hunks)
@@ -61,5 +61,5 @@ Viewing a Scheduled Task
       -  To be executed
       -  To be authorized

-.. |image1| image:: /_static/images/en-us_image_0000001786854381.png
-.. |image2| image:: /_static/images/en-us_image_0000001786854381.png
+.. |image1| image:: /_static/images/en-us_image_0000001191211679.png
+.. |image2| image:: /_static/images/en-us_image_0000001191211679.png
diff a/umn/source/working_with_rds_for_postgresql/task_center/viewing_a_task.rst b/umn/source/working_with_rds_for_postgresql/task_center/viewing_a_task.rst    (rejected hunks)
@@ -61,5 +61,5 @@ Viewing a Scheduled Task
       -  To be executed
       -  To be authorized

-.. |image1| image:: /_static/images/en-us_image_0000001786854381.png
-.. |image2| image:: /_static/images/en-us_image_0000001786854381.png
+.. |image1| image:: /_static/images/en-us_image_0000001191211679.png
+.. |image2| image:: /_static/images/en-us_image_0000001191211679.png
otc-zuul[bot] commented 3 months ago

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

:heavy_check_mark: noop SUCCESS in 0s :heavy_check_mark: otc-tox-docs SUCCESS in 11m 16s