Skip to content

Commit 53697a8

Browse files
authored
Merge pull request #252346 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 82eedbf + 9b5cca0 commit 53697a8

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

articles/cosmos-db/mongodb/tutorial-mongotools-cosmos-db.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ The rest of this section will guide you through using the pair of tools you sele
140140
1. To create a BSON data dump of your MongoDB instance, open a terminal on the MongoDB instance machine. If it is a Linux machine, type
141141

142142
```bash
143-
mongodump --host HOST:PORT --authenticationDatabase admin -u USERNAME -p PASSWORD --db edx --collection query --out edx-dump
143+
mongodump --host HOST:PORT --authenticationDatabase admin -u USERNAME -p PASSWORD --db edx --collection query --ssl --out edx-dump
144144
```
145145

146146
*HOST*, *PORT*, *USERNAME*, and *PASSWORD* should be filled in based on the properties of your existing MongoDB database instance. You should see that an `edx-dump` directory is produced and that the directory structure of `edx-dump` reproduces the resource hierarchy (database and collection structure) of your source MongoDB instance. Each collection is represented by a BSON file:

articles/cosmos-db/nosql/migrate-containers-partitioned-to-nonpartitioned.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public class DeviceInformationItem
6767
public string DeviceId { get; set; }
6868

6969
[JsonProperty(PropertyName = "_partitionKey", NullValueHandling = NullValueHandling.Ignore)]
70-
public string PartitionKey {get {return this.DeviceId; set; }
70+
public string PartitionKey { get {return this.DeviceId; set; }
7171
}
7272

7373
CosmosContainer migratedContainer = database.Containers["testContainer"];
@@ -86,7 +86,7 @@ ItemResponse<DeviceInformationItem > response =
8686
// Read back the document providing the same partition key
8787
ItemResponse<DeviceInformationItem> readResponse =
8888
await migratedContainer.ReadItemAsync<DeviceInformationItem>(
89-
partitionKey:deviceItem.PartitionKey,
89+
partitionKey: deviceItem.PartitionKey,
9090
id: device.Id
9191
);
9292

articles/machine-learning/includes/recommended-network-outbound.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ ms.author: larryfr
1414
| `anaconda.com`<br>`*.anaconda.com` | Used to install default packages. |
1515
| `*.anaconda.org` | Used to get repo data. |
1616
| `pypi.org` | Used to list dependencies from the default index, if any, and the index isn't overwritten by user settings. If the index is overwritten, you must also allow `*.pythonhosted.org`. |
17-
| `*pytorch.org` | Used by some examples based on PyTorch. |
18-
| `*.tensorflow.org` | Used by some examples based on Tensorflow. |
17+
| `pytorch.org`<br>`*.pytorch.org` | Used by some examples based on PyTorch. |
18+
| `*.tensorflow.org` | Used by some examples based on Tensorflow. |

articles/openshift/howto-use-key-vault-secrets.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,8 @@ export AZ_TENANT_ID=$(az account show -o tsv --query tenantId)
159159
160160
```
161161
az keyvault set-policy -n ${KEYVAULT_NAME} \
162-
--secret-permissions get \
163-
--spn ${SERVICE_PRINCIPAL_CLIENT_ID}
162+
--secret-permissions get \
163+
--spn ${SERVICE_PRINCIPAL_CLIENT_ID}
164164
```
165165
166166
1. Create and label a secret for Kubernetes to use to access the key vault.
@@ -170,7 +170,7 @@ export AZ_TENANT_ID=$(az account show -o tsv --query tenantId)
170170
-n my-application \
171171
--from-literal clientid=${SERVICE_PRINCIPAL_CLIENT_ID} \
172172
--from-literal clientsecret=${SERVICE_PRINCIPAL_CLIENT_SECRET}
173-
kubectl -n my-application label secret \
173+
kubectl -n my-application label secret \
174174
secrets-store-creds secrets-store.csi.k8s.io/used=true
175175
```
176176
@@ -199,7 +199,7 @@ export AZ_TENANT_ID=$(az account show -o tsv --query tenantId)
199199
objectType: secret
200200
objectVersion: ""
201201
tenantId: "${AZ_TENANT_ID}"
202-
EOF
202+
EOF
203203
```
204204
205205
1. Create a pod that uses the `SecretProviderClass` created in the previous step:
@@ -231,7 +231,7 @@ export AZ_TENANT_ID=$(az account show -o tsv --query tenantId)
231231
secretProviderClass: "azure-kvname"
232232
nodePublishSecretRef:
233233
name: secrets-store-creds
234-
EOF
234+
EOF
235235
```
236236
237237
1. Check that the secret is mounted:

0 commit comments

Comments
 (0)