Skip to content

Commit 5cebc15

Browse files
authored
Merge pull request #78959 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 5c1af98 + 8dc3ae0 commit 5cebc15

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

articles/azure-cache-for-redis/cache-how-to-premium-vnet.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,14 +109,17 @@ There are seven outbound port requirements.
109109
| Port(s) | Direction | Transport Protocol | Purpose | Local IP | Remote IP |
110110
| --- | --- | --- | --- | --- | --- |
111111
| 80, 443 |Outbound |TCP |Redis dependencies on Azure Storage/PKI (Internet) | (Redis subnet) |* |
112-
| 53 |Outbound |TCP/UDP |Redis dependencies on DNS (Internet/VNet) | (Redis subnet) |* |
112+
| 53 |Outbound |TCP/UDP |Redis dependencies on DNS (Internet/VNet) | (Redis subnet) | 168.63.129.16 and 169.254.169.254 <sup>1</sup> and any custom DNS server for the subnet <sup>3</sup> |
113113
| 8443 |Outbound |TCP |Internal communications for Redis | (Redis subnet) | (Redis subnet) |
114114
| 10221-10231 |Outbound |TCP |Internal communications for Redis | (Redis subnet) | (Redis subnet) |
115115
| 20226 |Outbound |TCP |Internal communications for Redis | (Redis subnet) |(Redis subnet) |
116116
| 13000-13999 |Outbound |TCP |Internal communications for Redis | (Redis subnet) |(Redis subnet) |
117117
| 15000-15999 |Outbound |TCP |Internal communications for Redis | (Redis subnet) |(Redis subnet) |
118118
| 6379-6380 |Outbound |TCP |Internal communications for Redis | (Redis subnet) |(Redis subnet) |
119119

120+
<sup>1</sup> These IP addresses owned by Microsoft are used to address the Host VM which serves Azure DNS.
121+
122+
<sup>3</sup> Not needed for subnets with no custom DNS server, or newer redis caches that ignore custom DNS.
120123

121124
#### Inbound port requirements
122125

articles/azure-functions/durable/durable-functions-error-handling.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.author: azfuncdf
1414

1515
# Handling errors in Durable Functions (Azure Functions)
1616

17-
Durable Function orchestrations are implemented in code and can use the error-handling capabilities of the programming language. With this in mind, there really aren't any new concepts you need to learn about when incorporating error handling and compensation into your orchestrations. However, there are a few behaviors that you should be aware of.
17+
Durable Function orchestrations are implemented in code and can use the error-handling capabilities of the programming language. With this in mind, there really aren't any new concepts you need to learn about incorporating error handling and compensation into your orchestrations. However, there are a few behaviors that you should be aware of.
1818

1919
## Errors in activity functions
2020

articles/service-bus-messaging/service-bus-resource-manager-namespace-topic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ The Service Bus API version of the template.
9595
Creates a standard Service Bus namespace of type **Messaging**, with topic and subscription.
9696

9797
```json
98-
"resources ": [{
98+
"resources": [{
9999
"apiVersion": "[variables('sbVersion')]",
100100
"name": "[parameters('serviceBusNamespaceName')]",
101101
"type": "Microsoft.ServiceBus/Namespaces",

articles/virtual-network/virtual-network-network-interface.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ The DNS server is assigned by the Azure DHCP server to the network interface wit
107107
4. Select either:
108108
- **Inherit from virtual network**: Choose this option to inherit the DNS server setting defined for the virtual network the network interface is assigned to. At the virtual network level, either a custom DNS server or the Azure-provided DNS server is defined. The Azure-provided DNS server can resolve hostnames for resources assigned to the same virtual network. FQDN must be used to resolve for resources assigned to different virtual networks.
109109
- **Custom**: You can configure your own DNS server to resolve names across multiple virtual networks. Enter the IP address of the server you want to use as a DNS server. The DNS server address you specify is assigned only to this network interface and overrides any DNS setting for the virtual network the network interface is assigned to.
110+
>[!Note]
111+
>If the VM uses a NIC that's part of an availability set, all the DNS servers that are specified for each of the VMs from all NICs that are part of the availability set will be inherited.
110112
5. Select **Save**.
111113

112114
**Commands**

0 commit comments

Comments
 (0)