Skip to content

Commit f3e19a2

Browse files
authored
Merge pull request #224728 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents a48097e + f73295b commit f3e19a2

File tree

4 files changed

+301
-300
lines changed

4 files changed

+301
-300
lines changed

articles/cosmos-db/nosql/quickstart-nodejs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ In the `index.js`, add the following code to use the resource **endpoint** and *
153153
154154
Add the following code to use the [``CosmosClient.Databases.createDatabaseIfNotExists``](/javascript/api/@azure/cosmos/databases#@azure-cosmos-databases-createifnotexists) method to create a new database if it doesn't already exist. This method will return a reference to the existing or newly created database.
155155

156-
:::code language="csharp" source="~/cosmos-db-sql-api-javascript-samples/001-quickstart/index.js" range="24-26":::
156+
:::code language="javascript" source="~/cosmos-db-sql-api-javascript-samples/001-quickstart/index.js" range="24-26":::
157157

158158
### Create a container
159159

articles/private-multi-access-edge-compute-mec/partner-programs.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ Our system integrators and non-operator MSP partners include:
3535
- American Tower
3636
- Capgemini
3737
- Cognizant
38-
- Expeto
3938
- Federated Wireless
4039
- Fujitsu
4140
- HCL
@@ -51,12 +50,12 @@ Azure Private MEC platform partners provide critical hardware and software compo
5150
Network functions partners include software vendors that provide mobile packet core, firewalls, routers, SD-WAN, vRAN, and RAN optimization. The breadth of third-party network functions available enable customers to securely integrate the Azure private MEC solution into their existing edge and cloud environments. The Azure private MEC current network function partners include:
5251

5352

54-
|Mobile Packet Core |Firewall, Routers, & SD-WAN |RAN Partners (software) |
55-
|---------|---------|---------|---------|
56-
|Celona | 128 Technology | AirHop |
57-
|Expeto | Arista | ASOCS |
58-
|HSS by HPE | Fortinet | Celona |
59-
| Nokia Digital Automation Cloud | NetFoundry | Commscope|
53+
|Firewall, Routers, & SD-WAN |RAN Partners (software) |
54+
|---------|---------|
55+
| 128 Technology | AirHop |
56+
| Arista | ASOCS |
57+
| Fortinet | Celona |
58+
| NetFoundry | Commscope|
6059
| | Nuage Networks by Nokia | Nokia|
6160
| |Palo Alto Networks | |
6261
| |Versa Networks | |
@@ -70,9 +69,9 @@ SIM & Device partners provide wireless authentication technologies and embedded
7069
|SIM|Devices |RAN (hardware)|
7170
|---------|---------|---------|
7271
|Commscope | Cradlepoint by Ericsson |ASOCS |
73-
|G+D | Multitech |Celona |
74-
|Gemalto | Sierra Wireless |Commscope |
75-
|IDEMIA | |Nokia |
72+
|G+D | Multitech |Commscope |
73+
|Gemalto | Sierra Wireless |Nokia|
74+
|IDEMIA | | |
7675
| JCI US (Contour Networks) | ||
7776
||||
7877

articles/role-based-access-control/transfer-subscription.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ Several Azure resources have a dependency on a subscription or a directory. Depe
8181
| Azure Policy | Yes | No | All Azure Policy objects, including custom definitions, assignments, exemptions, and compliance data. | You must [export](../governance/policy/how-to/export-resources.md), import, and re-assign definitions. Then, create new policy assignments and any needed [policy exemptions](../governance/policy/concepts/exemption-structure.md). |
8282
| Azure Active Directory Domain Services | Yes | No | | You cannot transfer an Azure AD Domain Services managed domain to a different directory. For more information, see [Frequently asked questions (FAQs) about Azure Active Directory (AD) Domain Services](../active-directory-domain-services/faqs.yml) |
8383
| App registrations | Yes | Yes | | |
84+
| Microsoft Dev Box | Yes | No | | You cannot transfer a dev box and its associated resources to a different directory. Once a subscription moves to another tenant, you will not be able to perform any actions on your dev box |
85+
| Azure Deployment Environments | Yes | No | | You cannot transfer an environment and its associated resources to a different directory. Once a subscription moves to another tenant, you will not be able to perform any actions on your environment |
8486

8587
> [!WARNING]
8688
> If you are using encryption at rest for a resource, such as a storage account or SQL database, that has a dependency on a key vault that is being transferred, it can lead to an unrecoverable scenario. If you have this situation, you should take steps to use a different key vault or temporarily disable customer-managed keys to avoid this unrecoverable scenario.

0 commit comments

Comments
 (0)