Skip to content

Commit 9ecd364

Browse files
committed
chore(gen): update
1 parent d071d1e commit 9ecd364

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

faq/serverless-functions.mdx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,14 +166,10 @@ Check out our [serverless-examples repository](https://github.com/scaleway/serve
166166
## How to migrate runtimes?
167167

168168
There are no constraints when changing a function runtime, you simply need to choose the runtime version you want.
169-
<<<<<<< HEAD
170169
Upgrading a runtime is highly recommended in case of deprecation, and for runtimes that have reached end-of-support or end-of-life. See the [functions runtimes lifecycle documentation](/serverless/functions/reference-content/functions-lifecycle/) for more information.
171170

172171
## How do I configure access to a Private Network?
173172

174173
Scaleway Serverless Functions does not currently support Scaleway VPC or Private Networks, though this feature is under development.
175174

176175
To add network restrictions on your resource, consult the [list of prefixes used at Scaleway](https://www.scaleway.com/en/peering/). Note that Serverless resources do not have dedicated or predictable IP addresses.
177-
=======
178-
Upgrading a runtime is highly recommended in case of deprecation, and for runtimes that have reached end-of-support or end-of-life. Refer to the [functions runtimes lifecycle documentation](/serverless/functions/reference-content/functions-lifecycle/) for more information.
179-
>>>>>>> 231926b2c (chore(gen): update)

faq/serverless-jobs.mdx

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,9 @@ Scaleway Serverless Jobs is part of the Scaleway ecosystem, it can therefore be
9393
## Can I run multiple Serverless Jobs at the same time?
9494

9595
When starting a Job, you can use contextual options to define the number of jobs to execute at the same time. Refer to the [dedicated documentation](/serverless/jobs/how-to/run-job/#how-to-run-a-job-with-contextual-options) for more information.
96+
97+
## How can I configure access to a Private Network?
98+
99+
Scaleway Serverless Jobs does not currently support Scaleway VPC or Private Networks, though this feature is under development.
100+
101+
To add network restrictions on your resource, consult the [list of prefixes used at Scaleway](https://www.scaleway.com/en/peering/). Serverless resources do not have dedicated or predictable IP addresses.

0 commit comments

Comments
 (0)