Skip to content

Commit 91f4c2a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into addingRegion
2 parents a0507c4 + d6cab39 commit 91f4c2a

28 files changed

+440
-246
lines changed

articles/aks/create-node-pools.md

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -155,21 +155,10 @@ The Azure Linux container host for AKS is an open-source Linux distribution avai
155155
156156
### Migrate Ubuntu nodes to Azure Linux nodes
157157
158-
1. [Add an Azure Linux node pool into your existing cluster](#add-an-azure-linux-node-pool).
158+
You can migrate your existing Ubuntu nodes to Azure Linux using one of the following methods:
159159
160-
> [!NOTE]
161-
> When adding a new Azure Linux node pool, you need to add at least one as `--mode System`. Otherwise, AKS won't allow you to delete your existing Ubuntu node pool.
162-
163-
2. [Cordon the existing Ubuntu nodes](resize-node-pool.md#cordon-the-existing-nodes).
164-
3. [Drain the existing Ubuntu nodes](resize-node-pool.md#drain-the-existing-nodes).
165-
4. Remove the existing Ubuntu nodes using the [`az aks delete`][az-aks-delete] command.
166-
167-
```azurecli-interactive
168-
az aks nodepool delete \
169-
--resource-group myResourceGroup \
170-
--cluster-name myAKSCluster \
171-
--name mynodepool
172-
```
160+
* [Remove existing node pools and add new Azure Linux node pools](../azure-linux/tutorial-azure-linux-migration.md#add-azure-linux-node-pools-and-remove-existing-node-pools).
161+
* [In-place OS SKU migration (preview)](../azure-linux/tutorial-azure-linux-migration.md#in-place-os-sku-migration-preview).
173162
174163
## Node pools with unique subnets
175164

articles/azure-arc/resource-bridge/troubleshoot-resource-bridge.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ To resolve this issue, delete the appliance and update the appliance YAML file.
3838

3939
### Appliance Network Unavailable
4040

41-
If Arc resource bridge is experiencing a network communication problem, you may see an "Appliance Network Unavailable" error when trying to perform an action that interacts with the resource bridge or an extension operating on top of the bridge. This error can also surface as "Error while dialing dial tcp xx.xx.xxx.xx:55000: connect: no route to host" and this is typically a network communication problem. The problem could be that communication from the host to the Arc resource bridge VM needs to be opened with the help of your network administrator. It could be that there was a temporary network issue not allowing the host to reach the Arc resource bridge VM and once the network issue is resolved, you can retry the operation.
41+
If Arc resource bridge is experiencing a network communication problem or is offline, you may see an "Appliance Network Unavailable" error when trying to perform an action that interacts with the resource bridge or an extension operating on top of the bridge. In general, any network or infrastructure connectivity issue to the appliance VM may cause this error. This error can also surface as "Error while dialing dial tcp xx.xx.xxx.xx:55000: connect: no route to host" and this is typically a network communication problem. The problem could be that communication from the host to the Arc resource bridge VM needs to be opened with the help of your network administrator. It could be that there was a temporary network issue not allowing the host to reach the Arc resource bridge VM and once the network issue is resolved, you can retry the operation. You may also need to check that the appliance VM for Arc resource bridge is not stopped. In the case of Azure Stack HCI, the host storage may be full which has caused the appliance VM to pause and the storage will need to be addressed.
4242

4343
### Connection closed before server preface received
4444

articles/azure-functions/language-support-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Azure Functions runtime is built around various components, including operating
1515

1616
### Notification phase
1717

18-
The Functions team sends notification emails to function app users about upcoming language version retirements. The notifications are sent at least one year before the date of retirement. When you receive the notification, you should prepare to upgrade functions apps to use to a supported version.
18+
The Functions team sends notification emails to function app users about upcoming language version retirements. When you receive the notification, you should prepare to upgrade functions apps to use to a supported version.
1919

2020
### Retirement phase
2121

articles/azure-linux/tutorial-azure-linux-migration.md

Lines changed: 247 additions & 92 deletions
Large diffs are not rendered by default.

articles/azure-netapp-files/azure-government.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ All [Azure NetApp Files features](whats-new.md) available on Azure public cloud
2626
| Azure NetApp Files features | Azure public cloud availability | Azure Government availability |
2727
|:--- |:--- |:--- |
2828
| Azure NetApp Files backup | Public preview | No |
29-
| Azure NetApp Files large volumes | Public preview | No |
29+
| Azure NetApp Files large volumes | Public preview | Public preview [(select regions)](large-volumes-requirements-considerations.md#supported-regions) |
3030

3131
## Portal access
3232

articles/azure-netapp-files/large-volumes-requirements-considerations.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ The following requirements and considerations apply to large volumes. For perfor
4343
| Ultra | 100 to 500 | 10,240 |
4444

4545
* Large volumes aren't currently supported with standard storage with cool access.
46+
4647
## Supported regions
4748

4849
Support for Azure NetApp Files large volumes is available in the following regions:
@@ -67,6 +68,7 @@ Support for Azure NetApp Files large volumes is available in the following regio
6768
* UAE North
6869
* UK West
6970
* UK South
71+
* US Gov Virginia
7072
* West Europe
7173
* West US
7274
* West US 2

articles/cosmos-db/includes/cosmos-db-sdk-list.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ ms.date: 09/28/2022
1515
> * [Node.js](../nosql/sdk-nodejs.md)
1616
> * [Java SDK v4](../nosql/sdk-java-v4.md)
1717
> * [Async Java SDK v2](../nosql/sdk-java-async-v2.md)
18-
> * [Sync Java SDK v2](../nosql/sdk-java-v2.md)
1918
> * [Spring Data v2](../nosql/sdk-java-spring-data-v2.md)
2019
> * [Spring Data v3](../nosql/sdk-java-spring-data-v3.md)
2120
> * [Spring Data v5](../nosql/sdk-java-spring-data-v5.md)

articles/cosmos-db/nosql/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -938,8 +938,6 @@
938938
href: sdk-java-v4.md
939939
- name: Async Java SDK v2 (legacy)
940940
href: sdk-java-async-v2.md
941-
- name: Sync Java SDK v2 (legacy)
942-
href: sdk-java-v2.md
943941
- name: Spring Data Connector v2 (legacy)
944942
href: sdk-java-spring-data-v2.md
945943
- name: Spring Data Connector v3

articles/cosmos-db/nosql/how-to-manage-conflicts.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ DocumentCollection createdCollection = client.createCollection(databaseUri, coll
8989

9090
# [Sync Java V2 SDK](#tab/sync)
9191

92-
[Sync Java V2 SDK](sdk-java-v2.md) (Maven [com.microsoft.azure::azure-documentdb](https://mvnrepository.com/artifact/com.microsoft.azure/azure-documentdb))
92+
(Maven [com.microsoft.azure::azure-documentdb](https://mvnrepository.com/artifact/com.microsoft.azure/azure-documentdb))
9393

9494
```java
9595
DocumentCollection lwwCollection = new DocumentCollection();
@@ -274,7 +274,7 @@ DocumentCollection createdCollection = client.createCollection(databaseUri, coll
274274

275275
# [Sync Java V2 SDK](#tab/sync)
276276

277-
[Sync Java V2 SDK](sdk-java-v2.md) (Maven [com.microsoft.azure::azure-documentdb](https://mvnrepository.com/artifact/com.microsoft.azure/azure-documentdb))
277+
(Maven [com.microsoft.azure::azure-documentdb](https://mvnrepository.com/artifact/com.microsoft.azure/azure-documentdb))
278278

279279
```java
280280
DocumentCollection udpCollection = new DocumentCollection();
@@ -384,7 +384,7 @@ DocumentCollection createdCollection = client.createCollection(databaseUri, coll
384384

385385
# [Sync Java V2 SDK](#tab/sync)
386386

387-
[Sync Java V2 SDK](sdk-java-v2.md) (Maven [com.microsoft.azure::azure-documentdb](https://mvnrepository.com/artifact/com.microsoft.azure/azure-documentdb))
387+
(Maven [com.microsoft.azure::azure-documentdb](https://mvnrepository.com/artifact/com.microsoft.azure/azure-documentdb))
388388

389389
```java
390390
DocumentCollection manualCollection = new DocumentCollection();
@@ -478,7 +478,7 @@ for (Conflict conflict : response.getResults()) {
478478
```
479479
# [Sync Java V2 SDK](#tab/v2sync)
480480

481-
[Sync Java V2 SDK](sdk-java-v2.md) (Maven [com.microsoft.azure::azure-documentdb](https://mvnrepository.com/artifact/com.microsoft.azure/azure-documentdb))
481+
(Maven [com.microsoft.azure::azure-documentdb](https://mvnrepository.com/artifact/com.microsoft.azure/azure-documentdb))
482482

483483
```java
484484
Iterator<Conflict> conflictsIterator = client.readConflicts(this.collectionLink, null).getQueryIterator();

articles/cosmos-db/nosql/how-to-use-stored-procedures-triggers-udfs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ms.custom: devx-track-csharp
2020

2121
The API for NoSQL in Azure Cosmos DB supports registering and invoking stored procedures, triggers, and user-defined functions (UDFs) written in JavaScript. After you define one or more stored procedures, triggers, or user-defined functions, you can load and view them in the [Azure portal](https://portal.azure.com/) by using Data Explorer.
2222

23-
You can use the API for NoSQL SDK across multiple platforms including [.NET v2 (legacy)](sdk-dotnet-v2.md), [.NET v3](sdk-dotnet-v3.md), [Java](sdk-java-v2.md), [JavaScript](sdk-nodejs.md), or [Python](sdk-python.md) SDKs to do these tasks. If you haven't worked with one of these SDKs before, see the quickstart article for the appropriate SDK:
23+
You can use the API for NoSQL SDK across multiple platforms including [.NET v2 (legacy)](sdk-dotnet-v2.md), [.NET v3](sdk-dotnet-v3.md), [Java](/java/api/overview/azure/cosmos-readme), [JavaScript](sdk-nodejs.md), or [Python](sdk-python.md) SDKs to do these tasks. If you haven't worked with one of these SDKs before, see the quickstart article for the appropriate SDK:
2424

2525
| SDK | Getting started |
2626
| :--- | :--- |

0 commit comments

Comments
 (0)