Skip to content

Commit 9c62061

Browse files
authored
Merge pull request #196081 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 54638b9 + 37e4af0 commit 9c62061

7 files changed

+36
-5
lines changed

articles/active-directory-b2c/social-transformations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ ms.subservice: B2C
1616

1717
# Social accounts claims transformations
1818

19-
In Azure Active Directory B2C (Azure AD B2C), social account identities are stored in a `userIdentities` attribute of a **alternativeSecurityIdCollection** claim type. Each item in the **alternativeSecurityIdCollection** specifies the issuer (identity provider name, such as facebook.com) and the `issuerUserId`, which is a unique user identifier for the issuer.
19+
In Azure Active Directory B2C (Azure AD B2C), social account identities are stored in a `alternativeSecurityIds` attribute of a **alternativeSecurityIdCollection** claim type. Each item in the **alternativeSecurityIdCollection** specifies the issuer (identity provider name, such as facebook.com) and the `issuerUserId`, which is a unique user identifier for the issuer.
2020

2121
```json
22-
"userIdentities": [{
22+
"alternativeSecurityIds": [{
2323
"issuer": "google.com",
2424
"issuerUserId": "MTA4MTQ2MDgyOTI3MDUyNTYzMjcw"
2525
},

articles/logic-apps/create-single-tenant-workflows-visual-studio-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ For more information, review the [Azurite documentation](https://github.com/Azur
107107
108108
Currently, you can have both Consumption (multi-tenant) and Standard (single-tenant) extensions installed at the same time. The development experiences differ from each other in some ways, but your Azure subscription can include both Standard and Consumption logic app types. Visual Studio Code shows all the deployed logic apps in your Azure subscription, but organizes your apps under each extension, **Azure Logic Apps (Consumption)** and **Azure Logic Apps (Standard)**.
109109

110-
* To use the [Inline Code Operations action](../logic-apps/logic-apps-add-run-inline-code.md) that runs JavaScript, install [Node.js versions 10.x.x, 11.x.x, or 12.x.x](https://nodejs.org/en/download/releases/).
110+
* To use the [Inline Code Operations action](../logic-apps/logic-apps-add-run-inline-code.md) that runs JavaScript, install [Node.js versions 12.x.x or 14.x.x](https://nodejs.org/en/download/releases/).
111111

112112
> [!TIP]
113113
> For Windows, download the MSI version. If you use the ZIP version instead, you have to

articles/purview/register-scan-azure-sql-database.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ The following options are supported:
134134

135135
* **Service Principal**- A service principal is an application that can be assigned permissions like any other group or user, without being associated directly with a person. Their authentication has an expiration date, and so can be useful for temporary projects. For more information, see the [service principal documenatation](/active-directory/develop/app-objects-and-service-principals).
136136

137-
* **SQL Authentication** - connect to the SQL database with a username and password. For more information about SQL Authentication, you can [follow the SQL authentication documenation](/sql/relational-databases/security/choose-an-authentication-mode#connecting-through-sql-server-authentication).If you need to create a login, follow this [guide to query an Azure SQL database](../azure-sql/database/connect-query-portal.md), and use [this guide to create a login using T-SQL.](/sql/t-sql/statements/create-login-transact-sql)
137+
* **SQL Authentication** - connect to the SQL database with a username and password. For more information about SQL Authentication, you can [follow the SQL authentication documentation](/sql/relational-databases/security/choose-an-authentication-mode#connecting-through-sql-server-authentication).If you need to create a login, follow this [guide to query an Azure SQL database](../azure-sql/database/connect-query-portal.md), and use [this guide to create a login using T-SQL.](/sql/t-sql/statements/create-login-transact-sql)
138138
> [!NOTE]
139139
> Be sure to select the Azure SQL Database option on the page.
140140

articles/service-fabric/service-fabric-dnsservice.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,23 @@ public class ValuesController : Controller
241241
}
242242
}
243243
```
244+
## Recursive Queries
245+
246+
For DNS names that the DNS service can't resolve on its own (for example, a public DNS name), it will forward the query to pre-existing recursive DNS servers on the nodes.
247+
248+
249+
Prior to Service Fabric 9.0, these servers were queried serially with a fixed timeout period of 5 seconds in between. If a server didn't respond within the timeout period, the next server (if available) would be queried. In the case that these DNS servers were encountering any issues, completion of DNS queries would take longer than 5 seconds, which is not ideal.
250+
251+
252+
Beginning in Service Fabric 9.0, support for parallel recursive queries was added. With parallel queries, all recursive DNS servers can be contacted at once, where the first response wins. This will result in quicker responses in the scenario previously mentioned.
253+
254+
Fine-grained options are also introduced in Service Fabric 9.0 to control the behavior of the recursive queries, including the timeout periods and query attempts. These options can be set in the cluster config, under **DnsService**:
255+
256+
- **RecursiveQuerySerialMaxAttempts** - The number of serial queries that will be attempted, at most. If this number is higher than the amount of forwarding DNS servers, querying will stop once all the servers have been attempted exactly once.
257+
- **RecursiveQuerySerialTimeout** - The timeout value in seconds for each attempted serial query.
258+
- **RecursiveQueryParallelMaxAttempts** - The number of times parallel queries will be attempted. Parallel queries are executed after the max attempts for serial queries have been exhausted.
259+
- **RecursiveQueryParallelTimeout** - The timeout value in seconds for each attempted parallel query.
260+
244261

245262
## Known Issues
246263
* For Service Fabric versions 6.3 and higher, there is a problem with DNS lookups for service names containing a hyphen in the DNS name. For more information on this issue, please track the following [GitHub Issue](https://github.com/Azure/service-fabric-issues/issues/1197). A fix for this is coming in the next 6.3 update.

articles/service-fabric/service-fabric-environment-variables-reference.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Internal Environment Variables Used by Service Fabric Runtime:
3333
- Fabric_ApplicationId
3434
- Fabric_CodePackageInstanceId
3535
- Fabric_CodePackageInstanceSeqNum
36+
- Fabric_InstanceId
37+
- Fabric_ReplicaId
3638
- Fabric_RuntimeConnectionAddress
3739
- Fabric_ServicePackageActivationGuid
3840
- Fabric_ServicePackageInstanceId

articles/service-fabric/service-fabric-get-started-linux.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,10 @@ Start a container-based [Service Fabric Onebox](https://hub.docker.com/_/microso
187187
```
188188

189189
3. Start the cluster.<br/>
190+
<b>Ubuntu 20.04 LTS:</b>
191+
```bash
192+
docker run --name sftestcluster -d -v /var/run/docker.sock:/var/run/docker.sock -p 19080:19080 -p 19000:19000 -p 25100-25200:25100-25200 mcr.microsoft.com/service-fabric/onebox:u20
193+
```
190194
<b>Ubuntu 18.04 LTS:</b>
191195
```bash
192196
docker run --name sftestcluster -d -v /var/run/docker.sock:/var/run/docker.sock -p 19080:19080 -p 19000:19000 -p 25100-25200:25100-25200 mcr.microsoft.com/service-fabric/onebox:u18

articles/virtual-network/virtual-networks-faq.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,14 @@ Yes. Azure reserves 5 IP addresses within each subnet. These are x.x.x.0-x.x.x.3
7474
- x.x.x.2, x.x.x.3: Reserved by Azure to map the Azure DNS IPs to the VNet space
7575
- x.x.x.255: Network broadcast address for subnets of size /25 and larger. This will be a different address in smaller subnets.
7676

77+
For example, for the subnet with addressing 172.16.1.128/26:
78+
79+
- 172.16.1.128: Network address
80+
- 172.16.1.129: Reserved by Azure for the default gateway
81+
- 172.16.1.130, 172.16.1.131: Reserved by Azure to map the Azure DNS IPs to the VNet space
82+
- 172.16.1.191: Network broadcast address
83+
84+
7785
### How small and how large can VNets and subnets be?
7886
The smallest supported IPv4 subnet is /29, and the largest is /2 (using CIDR subnet definitions). IPv6 subnets must be exactly /64 in size.
7987

@@ -502,4 +510,4 @@ For more information, see [FAQ about classic to Azure Resource Manager migration
502510

503511
### How can I report an issue?
504512

505-
You can post your questions about your migration issues to the [Microsoft Q&A](/answers/topics/azure-virtual-network.html) page. It's recommended that you post all your questions on this forum. If you have a support contract, you can also file a support request.
513+
You can post your questions about your migration issues to the [Microsoft Q&A](/answers/topics/azure-virtual-network.html) page. It's recommended that you post all your questions on this forum. If you have a support contract, you can also file a support request.

0 commit comments

Comments
 (0)