Skip to content

Commit b514381

Browse files
authored
Merge pull request #48810 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
2 parents 843f450 + 91704be commit b514381

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

articles/automation/automation-onboard-solutions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ To complete this tutorial, the following are required:
3131

3232
## Onboard an Azure VM
3333

34-
There are multiple ways to onboard machines, you can onboard the solution [from a virtual machine](automation-onboard-solutions-from-vm.md), [from browsing multiple machines](automation-onboard-solutions-from-browse.md) [from your Automation account](automation-onboard-solutions-from-automation-account.md), or by runbook. This tutorial walks through through enabling Update Management through a runbook. To onboard Azure Virtual Machines at scale, an existing VM must be onboarded with the Change tracking or Update management solution. In this step, you onboard a virtual machine with Update management, and Change tracking.
34+
There are multiple ways to onboard machines, you can onboard the solution [from a virtual machine](automation-onboard-solutions-from-vm.md), [from browsing multiple machines](automation-onboard-solutions-from-browse.md) [from your Automation account](automation-onboard-solutions-from-automation-account.md), or by runbook. This tutorial walks through enabling Update Management through a runbook. To onboard Azure Virtual Machines at scale, an existing VM must be onboarded with the Change tracking or Update management solution. In this step, you onboard a virtual machine with Update management, and Change tracking.
3535

3636
### Enable Change Tracking and Inventory
3737

articles/data-factory/control-flow-for-each-activity.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ Property | Description | Allowed values | Required
7171
name | Name of the for-each activity. | String | Yes
7272
type | Must be set to **ForEach** | String | Yes
7373
isSequential | Specifies whether the loop should be executed sequentially or in parallel. Maximum of 20 loop iterations can be executed at once in parallel). For example, if you have a ForEach activity iterating over a copy activity with 10 different source and sink datasets with **isSequential** set to False, all copies are executed at once. Default is False. <br/><br/> If "isSequential" is set to False, ensure that there is a correct configuration to run multiple executables. Otherwise, this property should be used with caution to avoid incurring write conflicts. For more information, see [Parallel execution](#parallel-execution) section. | Boolean | No. Default is False.
74+
batchCount | Batch count to be used for controlling the number of parallel execution (when isSequential is set to false). | Integer (maximum 50) | No. Default is 20.
7475
Items | An expression that returns a JSON Array to be iterated over. | Expression (which returns a JSON Array) | Yes
7576
Activities | The activities to be executed. | List of Activities | Yes
7677

0 commit comments

Comments
 (0)