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 #64

Open otcbot[bot] opened 2 weeks ago

otcbot[bot] commented 2 weeks 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/98.

There were patch conflicts, please review original patch file.

otcbot[bot] commented 2 weeks 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,12 @@ Change History
 +-----------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | Released On                       | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                |
 +===================================+============================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================+
+| 2024-10-12                        | Modified the following content:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+|                                   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+|                                   | -  :ref:`Scaling up Storage Space <en-us_topic_scale_cluster>`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
+|                                   | -  :ref:`Scaling up Storage Space <rds_pg_scale_cluster>`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
+|                                   | -  :ref:`Scaling up Storage Space <rds_sqlserver_scale_cluster>`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          |
++-----------------------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
 | 2024-08-26                        | Modified the following content:                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 |                                   |                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            |
 |                                   | Supported PostgreSQL 16. Added :ref:`RDS for PostgreSQL Versioning Policy <en-us_topic_0000002023864553>`.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
diff a/umn/source/introduction/db_instance_description/db_instance_classes.rst b/umn/source/introduction/db_instance_description/db_instance_classes.rst    (rejected hunks)
@@ -41,11 +41,7 @@ RDS for MySQL Instance Classes
    +-----------------+--------------------------------------------------+--------------------------------------+-----------------------------------------+-------+-------------+
    |                 | rds.mysql.n1.2xlarge.4.ha                        | rds.mysql.n1.2xlarge.4.rr            | rds.mysql.n1.2xlarge.4                  | 8     | 32          |
    +-----------------+--------------------------------------------------+--------------------------------------+-----------------------------------------+-------+-------------+
-   | Dedicated       | rds.mysql.x1.medium.2.ha                         | rds.mysql.x1.medium.2.rr             | rds.mysql.x1.medium.2                   | 1     | 2           |
-   +-----------------+--------------------------------------------------+--------------------------------------+-----------------------------------------+-------+-------------+
-   |                 | rds.mysql.x1.medium.4.ha                         | rds.mysql.x1.medium.4.rr             | rds.mysql.x1.medium.4                   | 1     | 4           |
-   +-----------------+--------------------------------------------------+--------------------------------------+-----------------------------------------+-------+-------------+
-   |                 | rds.mysql.x1.large.2.ha                          | rds.mysql.x1.large.2.rr              | rds.mysql.x1.large.2                    | 2     | 4           |
+   | Dedicated       | rds.mysql.x1.large.2.ha                          | rds.mysql.x1.large.2.rr              | rds.mysql.x1.large.2                    | 2     | 4           |
    +-----------------+--------------------------------------------------+--------------------------------------+-----------------------------------------+-------+-------------+
    |                 | rds.mysql.x1.large.4.ha                          | rds.mysql.x1.large.4.rr              | rds.mysql.x1.large.4                    | 2     | 8           |
    +-----------------+--------------------------------------------------+--------------------------------------+-----------------------------------------+-------+-------------+
@@ -106,11 +102,7 @@ RDS for PostgreSQL Instance Classes
    +-----------------+--------------------------------------------------+--------------------------------------+-----------------------------------------+-------+-------------+
    |                 | rds.pg.n1.2xlarge.4.ha                           | rds.pg.n1.2xlarge.4.rr               | rds.pg.n1.2xlarge.4                     | 8     | 32          |
    +-----------------+--------------------------------------------------+--------------------------------------+-----------------------------------------+-------+-------------+
-   | Dedicated       | rds.pg.x1.medium.2.ha                            | rds.pg.x1.medium.2.rr                | rds.pg.x1.medium.2                      | 1     | 2           |
-   +-----------------+--------------------------------------------------+--------------------------------------+-----------------------------------------+-------+-------------+
-   |                 | rds.pg.x1.medium.4.ha                            | rds.pg.x1.medium.4.rr                | rds.pg.x1.medium.4                      | 1     | 4           |
-   +-----------------+--------------------------------------------------+--------------------------------------+-----------------------------------------+-------+-------------+
-   |                 | rds.pg.x1.large.2.ha                             | rds.pg.x1.large.2.rr                 | rds.pg.x1.large.2                       | 2     | 4           |
+   | Dedicated       | rds.pg.x1.large.2.ha                             | rds.pg.x1.large.2.rr                 | rds.pg.x1.large.2                       | 2     | 4           |
    +-----------------+--------------------------------------------------+--------------------------------------+-----------------------------------------+-------+-------------+
    |                 | rds.pg.x1.large.4.ha                             | rds.pg.x1.large.4.rr                 | rds.pg.x1.large.4                       | 2     | 8           |
    +-----------------+--------------------------------------------------+--------------------------------------+-----------------------------------------+-------+-------------+