Skip to content

Commit 8f948c7

Browse files
authored
Merge pull request #223843 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 6885850 + b2d6133 commit 8f948c7

File tree

6 files changed

+13
-17
lines changed

6 files changed

+13
-17
lines changed

articles/azure-resource-manager/managed-applications/microsoft-common-dropdown.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ When filtering is enabled, the control includes a text box for adding the filter
4545
"type": "Microsoft.Common.DropDown",
4646
"label": "Example drop down",
4747
"placeholder": "",
48-
"defaultValue": "Value two",
48+
"defaultValue": ["Value two"],
4949
"toolTip": "",
5050
"multiselect": true,
5151
"selectAll": true,

articles/machine-learning/how-to-convert-custom-model-to-mlflow.md

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,8 @@ The following code demonstrates how to create a Python wrapper for an `sklearn`
4141
# Load training and test datasets
4242
from sys import version_info
4343
import sklearn
44-
from sklearn import datasets
45-
from sklearn.model_selection import train_test_split
46-
4744
import mlflow.pyfunc
48-
from sklearn.metrics import mean_squared_error
49-
from sklearn.model_selection import train_test_split
45+
5046

5147
PYTHON_VERSION = "{major}.{minor}.{micro}".format(major=version_info.major,
5248
minor=version_info.minor,
@@ -99,7 +95,7 @@ conda_env = {
9995
Once your environment is ready, you can pass the SKlearnWrapper, the Conda environment, and your newly created artifacts dictionary to the mlflow.pyfunc.save_model() method. Doing so saves the model to your disk.
10096

10197
```python
102-
mlflow_pyfunc_model_path = "sklearn_mlflow_pyfunc7"
98+
mlflow_pyfunc_model_path = "sklearn_mlflow_pyfunc_custom"
10399
mlflow.pyfunc.save_model(path=mlflow_pyfunc_model_path, python_model=SKLearnWrapper(), conda_env=conda_env, artifacts=artifacts)
104100

105101
```

articles/resource-mover/tutorial-move-region-powershell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
7070
Sign in to your Azure subscription with the Connect-AzAccount cmdlet:
7171

7272
```azurepowershell-interactive
73-
Connect-AzAccount – Subscription "<subscription-id>"
73+
Connect-AzAccount –Subscription "<subscription-id>"
7474
```
7575

7676
## Set up the move collection
@@ -421,4 +421,4 @@ After committing the move, and verifying that resources work as expected in the
421421
422422
## Next steps
423423
424-
[Learn more](./tutorial-move-region-virtual-machines.md) about move Azure VMs in the portal.
424+
[Learn more](./tutorial-move-region-virtual-machines.md) about move Azure VMs in the portal.

articles/route-server/overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Azure Route Server simplifies dynamic routing between your network virtual appli
1919

2020
## How does it work?
2121

22-
The following diagram illustrates how Azure Route Server works with an SDWAN NVA and a security NVA in a virtual network. Once you’ve established the BGP peering, Azure Route Server will receive an on-premises route (10.250.0.0/16) from the SDWAN appliance and a default route (0.0.0.0/0) from the firewall. These routes are then automatically configured on the VMs in the virtual network. As a result, all traffic destined to the on-premises network will be sent to the SDWAN appliance. While all Internet-bound traffic will be sent to the firewall. In the opposite direction, Azure Route Server will send the virtual network address (10.1.0.0/16) to both NVAs. The SDWAN appliance can propagate it further to the on-premises network.
22+
The following diagram illustrates how Azure Route Server works with an SDWAN NVA and a security NVA in a virtual network. Once you’ve established the BGP peering, Azure Route Server will receive an on-premises route (10.250.0.0/16) from the SDWAN appliance and a default route (0.0.0.0/0) from the firewall. These routes are then automatically configured on the VMs in the virtual network. As a result, all traffic destined to the on-premises network will be sent to the SDWAN appliance, while all Internet-bound traffic will be sent to the firewall. In the opposite direction, Azure Route Server will send the virtual network address (10.1.0.0/16) to both NVAs. The SDWAN appliance can propagate it further to the on-premises network.
2323

2424
:::image type="content" source="./media/overview/route-server-overview.png" alt-text="Diagram showing Azure Route Server configured in a virtual network.":::
2525

articles/storage/file-sync/file-sync-planning.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,11 @@ With Azure File Sync, you will need to account for the following taking up space
194194
We'll use an example to illustrate how to estimate the amount of free space would need on your local disk. Let's say you installed your Azure File Sync agent on your Azure Windows VM, and plan to create a server endpoint on disk F. You have 1 million files and would like to tier all of them, 100,000 directories, and a disk cluster size of 4 KiB. The disk size is 1000 GiB. You want to enable cloud tiering and set your volume free space policy to 20%.
195195

196196
1. NTFS allocates a cluster size for each of the tiered files. 1 million files * 4 KiB cluster size = 4,000,000 KiB (4 GiB)
197-
> [!Note]
198-
> The space occupied by tiered files is allocated by NTFS. Therefore, it will not show up in any UI.
199-
3. Sync metadata occupies a cluster size per item. (1 million files + 100,000 directories) * 4 KB cluster size = 4,400,000 KiB (4.4 GiB)
200-
4. Azure File Sync heatstore occupies 1.1 KiB per file. 1 million files * 1.1 KiB = 1,100,000 KiB (1.1 GiB)
201-
5. Volume free space policy is 20%. 1000 GiB * 0.2 = 200 GiB
197+
> [!Note]
198+
> The space occupied by tiered files is allocated by NTFS. Therefore, it will not show up in any UI.
199+
1. Sync metadata occupies a cluster size per item. (1 million files + 100,000 directories) * 4 KB cluster size = 4,400,000 KiB (4.4 GiB)
200+
1. Azure File Sync heatstore occupies 1.1 KiB per file. 1 million files * 1.1 KiB = 1,100,000 KiB (1.1 GiB)
201+
1. Volume free space policy is 20%. 1000 GiB * 0.2 = 200 GiB
202202

203203
In this case, Azure File Sync would need about 209,500,000 KiB (209.5 GiB) of space for this namespace. Add this amount to any additional free space that is desired in order to figure out how much free space is required for this disk.
204204

includes/iot-dps-limits.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The Device Provisioning Service has the following rate limits.
3333

3434
| Rate | Per-unit value | Adjustable? |
3535
| --- | --- | --- |
36-
| Operations | 200/min/service | Yes |
37-
| Device registrations | 200/min/service | Yes |
36+
| Operations | 1,000/min/service | Yes |
37+
| Device registrations | 1,000/min/service | Yes |
3838
| Device polling operation | 5/10 sec/device | No |
3939

0 commit comments

Comments
 (0)