Skip to content

Commit 66a5d6a

Browse files
authored
Merge branch 'main' into v1.5897.0
2 parents eec7410 + 3ebc665 commit 66a5d6a

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

scaleway-async/scaleway_async/lb/v1/api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,7 +1357,7 @@ async def update_health_check(
13571357
:param check_send_proxy: Defines whether proxy protocol should be activated for the health check.
13581358
:param tcp_config: Object to configure a basic TCP health check.
13591359
One-Of ('config'): at most one of 'tcp_config', 'mysql_config', 'pgsql_config', 'ldap_config', 'redis_config', 'http_config', 'https_config' could be set.
1360-
:param mysql_config: Object to configure a MySQL health check. The check requires MySQL >=3.22, for older versions, use a TCP health check.
1360+
:param mysql_config: Object to configure a MySQL health check. The check requires MySQL >=3.22 or <9.0. For older or newer versions, use a TCP health check.
13611361
One-Of ('config'): at most one of 'tcp_config', 'mysql_config', 'pgsql_config', 'ldap_config', 'redis_config', 'http_config', 'https_config' could be set.
13621362
:param pgsql_config: Object to configure a PostgreSQL health check.
13631363
One-Of ('config'): at most one of 'tcp_config', 'mysql_config', 'pgsql_config', 'ldap_config', 'redis_config', 'http_config', 'https_config' could be set.
@@ -4389,7 +4389,7 @@ async def update_health_check(
43894389
:param check_send_proxy: Defines whether proxy protocol should be activated for the health check.
43904390
:param tcp_config: Object to configure a basic TCP health check.
43914391
One-Of ('config'): at most one of 'tcp_config', 'mysql_config', 'pgsql_config', 'ldap_config', 'redis_config', 'http_config', 'https_config' could be set.
4392-
:param mysql_config: Object to configure a MySQL health check. The check requires MySQL >=3.22, for older versions, use a TCP health check.
4392+
:param mysql_config: Object to configure a MySQL health check. The check requires MySQL >=3.22 or <9.0. For older or newer versions, use a TCP health check.
43934393
One-Of ('config'): at most one of 'tcp_config', 'mysql_config', 'pgsql_config', 'ldap_config', 'redis_config', 'http_config', 'https_config' could be set.
43944394
:param pgsql_config: Object to configure a PostgreSQL health check.
43954395
One-Of ('config'): at most one of 'tcp_config', 'mysql_config', 'pgsql_config', 'ldap_config', 'redis_config', 'http_config', 'https_config' could be set.

scaleway-async/scaleway_async/marketplace/v2/types.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ class Image:
9393
label: str
9494
"""
9595
Typically an identifier for a distribution (ex. "ubuntu_focal").
96+
This label can be used in the image field of the server creation request.
9697
"""
9798

9899
created_at: Optional[datetime]
@@ -135,7 +136,7 @@ class LocalImage:
135136

136137
label: str
137138
"""
138-
Image label this image belongs to.
139+
This label can be used in the image field of the server creation request.
139140
"""
140141

141142
type_: LocalImageType

scaleway/scaleway/lb/v1/api.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1357,7 +1357,7 @@ def update_health_check(
13571357
:param check_send_proxy: Defines whether proxy protocol should be activated for the health check.
13581358
:param tcp_config: Object to configure a basic TCP health check.
13591359
One-Of ('config'): at most one of 'tcp_config', 'mysql_config', 'pgsql_config', 'ldap_config', 'redis_config', 'http_config', 'https_config' could be set.
1360-
:param mysql_config: Object to configure a MySQL health check. The check requires MySQL >=3.22, for older versions, use a TCP health check.
1360+
:param mysql_config: Object to configure a MySQL health check. The check requires MySQL >=3.22 or <9.0. For older or newer versions, use a TCP health check.
13611361
One-Of ('config'): at most one of 'tcp_config', 'mysql_config', 'pgsql_config', 'ldap_config', 'redis_config', 'http_config', 'https_config' could be set.
13621362
:param pgsql_config: Object to configure a PostgreSQL health check.
13631363
One-Of ('config'): at most one of 'tcp_config', 'mysql_config', 'pgsql_config', 'ldap_config', 'redis_config', 'http_config', 'https_config' could be set.
@@ -4387,7 +4387,7 @@ def update_health_check(
43874387
:param check_send_proxy: Defines whether proxy protocol should be activated for the health check.
43884388
:param tcp_config: Object to configure a basic TCP health check.
43894389
One-Of ('config'): at most one of 'tcp_config', 'mysql_config', 'pgsql_config', 'ldap_config', 'redis_config', 'http_config', 'https_config' could be set.
4390-
:param mysql_config: Object to configure a MySQL health check. The check requires MySQL >=3.22, for older versions, use a TCP health check.
4390+
:param mysql_config: Object to configure a MySQL health check. The check requires MySQL >=3.22 or <9.0. For older or newer versions, use a TCP health check.
43914391
One-Of ('config'): at most one of 'tcp_config', 'mysql_config', 'pgsql_config', 'ldap_config', 'redis_config', 'http_config', 'https_config' could be set.
43924392
:param pgsql_config: Object to configure a PostgreSQL health check.
43934393
One-Of ('config'): at most one of 'tcp_config', 'mysql_config', 'pgsql_config', 'ldap_config', 'redis_config', 'http_config', 'https_config' could be set.

scaleway/scaleway/marketplace/v2/types.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ class Image:
9393
label: str
9494
"""
9595
Typically an identifier for a distribution (ex. "ubuntu_focal").
96+
This label can be used in the image field of the server creation request.
9697
"""
9798

9899
created_at: Optional[datetime]
@@ -135,7 +136,7 @@ class LocalImage:
135136

136137
label: str
137138
"""
138-
Image label this image belongs to.
139+
This label can be used in the image field of the server creation request.
139140
"""
140141

141142
type_: LocalImageType

0 commit comments

Comments
 (0)