Skip to content

Commit 542f3e8

Browse files
authored
Merge pull request #112329 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 8b5b209 + a25dd4a commit 542f3e8

File tree

13 files changed

+58
-57
lines changed

13 files changed

+58
-57
lines changed

articles/active-directory/hybrid/reference-connect-sync-attributes-synchronized.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.workload: identity
1212
ms.tgt_pltfrm: na
1313
ms.devlang: na
1414
ms.topic: reference
15-
ms.date: 04/24/2019
15+
ms.date: 04/15/2020
1616
ms.subservice: hybrid
1717
ms.author: billmath
1818

@@ -370,7 +370,7 @@ This group is a set of attributes used as the minimal attributes needed for a ge
370370
* Yammer (only User is consumed)
371371
* [Hybrid Business-to-Business (B2B) cross-org collaboration scenarios offered by resources like SharePoint](https://go.microsoft.com/fwlink/?LinkId=747036)
372372

373-
This group is a set of attributes that can be used if the Azure AD directory is not used to support Office 365, Dynamics, or Intune. It has a small set of core attributes.
373+
This group is a set of attributes that can be used if the Azure AD directory is not used to support Office 365, Dynamics, or Intune. It has a small set of core attributes. Note that single sign-on or provisioning to some third-party applications requires configuring synchronization of attributes in addition to the attributes described here. Application requirements are described in the [SaaS app tutorial](../saas-apps/tutorial-list.md) for each application.
374374

375375
| Attribute Name | User | Contact | Group | Comment |
376376
| --- |:---:|:---:|:---:| --- |

articles/active-directory/saas-apps/ally-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To learn more about SaaS app integration with Azure AD, see [What is application
3434
To get started, you need the following items:
3535

3636
* An Azure AD subscription. If you don't have a subscription, you can get a [free account](https://azure.microsoft.com/free/).
37-
* Ally single sign-on (SSO) enabled subscription.
37+
* An Ally single sign-on (SSO) enabled subscription. If you don't have a subscription, [start your free trial](https://www.ally.io/?utm_source=azure&utm_medium=mktgplace&utm_term=tutorial).
3838

3939
## Scenario description
4040

articles/availability-zones/az-overview.md

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -31,37 +31,37 @@ To achieve comprehensive business continuity on Azure, build your application ar
3131
The combinations of Azure services and regions that support Availability Zones are:
3232

3333

34-
| |Americas | | | | Europe | | | | Asia Pacific | |
35-
|----------------------------|----------|----------|---------|---------|--------------|------------|--------|----------|----------|-------------|
36-
| |Central US|East US|East US 2|West US 2|France Central|North Europe|UK South|West Europe|Japan East|Southeast Asia|
37-
| **Compute** | | | | | | | | | | |
38-
| Linux Virtual Machines | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
39-
| Windows Virtual Machines | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
40-
| Virtual Machine Scale Sets | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
41-
| Azure App Service Environments ILB | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
42-
| Azure Kubernetes Service | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
43-
| **Storage** | | | | | | | | | | |
44-
| Managed Disks | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
45-
| Zone-redundant Storage | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
46-
| **Networking** | | | | | | | | | | |
47-
| Standard IP Address | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
48-
| Standard Load Balancer | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
49-
| VPN Gateway | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
50-
| ExpressRoute Gateway | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
51-
| Application Gateway(V2) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
52-
| Azure Firewall | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
53-
| **Databases** | | | | | | | | | | |
54-
| Azure Data Explorer | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
55-
| SQL Database | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ (Preview) | ✓ |
56-
| Azure Cache for Redis | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
57-
| Azure Cosmos DB | ✓ | ✓ | ✓ | ✓ | | | ✓ | ✓ | | ✓ |
58-
| **Analytics** | | | | | | | | | | |
59-
| Event Hubs | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
60-
| **Integration** | | | | | | | | | | |
61-
| Service Bus (Premium Tier Only) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ | ✓ |✓ | ✓ |
62-
| Event Grid | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ | ✓ |✓ | ✓ |
63-
| **Identity** | | | | | | | | | | |
64-
| Azure AD Domain Services | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ | ✓ |✓ | ✓ |
34+
| |Americas | | | | Europe | | | | Asia Pacific | | |
35+
|----------------------------|----------|----------|---------|---------|--------------|------------|--------|----------|----------|-------------|-------------|
36+
| |Central US|East US|East US 2|West US 2|France Central|North Europe|UK South|West Europe|Japan East|Southeast Asia|Australia East|
37+
| **Compute** | | | | | | | | | | | |
38+
| Linux Virtual Machines | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
39+
| Windows Virtual Machines | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
40+
| Virtual Machine Scale Sets | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
41+
| Azure App Service Environments ILB | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
42+
| Azure Kubernetes Service | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
43+
| **Storage** | | | | | | | | | | | |
44+
| Managed Disks | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
45+
| Zone-redundant Storage | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
46+
| **Networking** | | | | | | | | | | | |
47+
| Standard IP Address | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
48+
| Standard Load Balancer | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
49+
| VPN Gateway | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
50+
| ExpressRoute Gateway | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
51+
| Application Gateway(V2) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
52+
| Azure Firewall | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
53+
| **Databases** | | | | | | | | | | | |
54+
| Azure Data Explorer | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
55+
| SQL Database | ✓ | ✓ | ✓ | ✓(Preview) | ✓ | ✓(Preview) | ✓ | ✓ | ✓ | ✓ |✓ |
56+
| Azure Cache for Redis | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
57+
| Azure Cosmos DB | ✓ | ✓ | ✓ | ✓ | | | ✓ | ✓ | | ✓ | |
58+
| **Analytics** | | | | | | | | | | | |
59+
| Event Hubs | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | |
60+
| **Integration** | | | | | | | | | | | |
61+
| Service Bus (Premium Tier Only) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ | ✓ |✓ | ✓ | |
62+
| Event Grid | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ | ✓ |✓ | ✓ | |
63+
| **Identity** | | | | | | | | | | | |
64+
| Azure AD Domain Services | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |✓ | ✓ |✓ | ✓ | |
6565

6666
## Services resiliency
6767
All Azure management services are architected to be resilient from region-level failures. In the spectrum of failures, one or more Availability Zone failures within a region have a smaller failure radius compared to an entire region failure. Azure can recover from a zone-level failure of management services within the region or from another Azure region. Azure performs critical maintenance one zone at a time within a region, to prevent any failures impacting customer resources deployed across Availability Zones within a region.

articles/azure-functions/functions-bindings-storage-blob-trigger.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ Azure Functions stores blob receipts in a container named *azure-webjobs-hosts*
386386
* The blob name
387387
* The ETag (a blob version identifier, for example: "0x8D1DC6E70A277EF")
388388

389-
To force reprocessing of a blob, delete the blob receipt for that blob from the *azure-webjobs-hosts* container manually. While reprocessing might not occur immediately, it's guaranteed to occur at a later point in time.
389+
To force reprocessing of a blob, delete the blob receipt for that blob from the *azure-webjobs-hosts* container manually. While reprocessing might not occur immediately, it's guaranteed to occur at a later point in time. To reprocess immediately, the *scaninfo* blob in *azure-webjobs-hosts/blobscaninfo* can be updated. Any blobs with a last modified timestamp after the `LatestScan` property will be scanned again.
390390

391391
## Poison blobs
392392

articles/azure-government/documentation-government-services-securityandidentity.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,10 @@ All features covered in the above list are available in the US Government cloud
146146

147147
### Variations
148148

149-
The following Azure Active Directory Premium P1 features are currently not available in Azure Government:
150-
151-
- Azure Active Directory Domain Services
152-
- B2B Collaboration is available in Azure US Government tenants created after June, 2019. Over time, more tenants will get access to this functionality. See [How can I tell if B2B collaboration is available in my Azure US Government tenant?](../active-directory/b2b/current-limitations.md#how-can-i-tell-if-b2b-collaboration-is-available-in-my-azure-us-government-tenant)
153-
154149
The following features have known limitations in Azure Government:
155150

156151
- Limitations with B2B Collaboration in supported Azure US Government tenants:
152+
- B2B Collaboration is available in Azure US Government tenants created after June, 2019. Over time, more tenants will get access to this functionality. See [How can I tell if B2B collaboration is available in my Azure US Government tenant?](../active-directory/b2b/current-limitations.md#how-can-i-tell-if-b2b-collaboration-is-available-in-my-azure-us-government-tenant).
157153
- B2B collaboration is currently only supported between tenants that are both within Azure US Government cloud and that both support B2B collaboration. If you invite a user in a tenant that isn't part of the Azure US Government cloud or that doesn't yet support B2B collaboration, the invitation will fail or the user will be unable to redeem the invitation.
158154
- B2B collaboration via Power BI is not supported. When you invite a guest user from within Power BI, the B2B flow is not used and the guest user won't appear in the tenant's user list. If a guest user is invited through other means, they'll appear in the Power BI user list, but any sharing request to the user will fail and display a 403 Forbidden error.
159155
- Office 365 Groups are not supported for B2B users and can't be enabled.

articles/sql-database/sql-database-import.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Migrating a database into a [managed instance](sql-database-managed-instance.md)
5555

5656
## Using SqlPackage
5757

58-
To import a SQL Server database using the [SqlPackage](https://docs.microsoft.com/sql/tools/sqlpackage) command-line utility, see [import parameters and properties](https://docs.microsoft.com/sql/tools/sqlpackage#import-parameters-and-properties). SqlPackage has the latest [SQL Server Management Studio](https://docs.microsoft.com/sql/ssms/download-sql-server-management-studio-ssms) and [SQL Server Data Tools for Visual Studio](https://msdn.microsoft.com/library/mt204009.aspx). You can also download the latest [SqlPackage](https://www.microsoft.com/download/details.aspx?id=53876) from the Microsoft download center.
58+
To import a SQL Server database using the [SqlPackage](https://docs.microsoft.com/sql/tools/sqlpackage) command-line utility, see [import parameters and properties](https://docs.microsoft.com/sql/tools/sqlpackage#import-parameters-and-properties). [SQL Server Management Studio](https://docs.microsoft.com/sql/ssms/download-sql-server-management-studio-ssms) and [SQL Server Data Tools for Visual Studio](https://msdn.microsoft.com/library/mt204009.aspx) include SqlPackage. You can also download the latest [SqlPackage](https://www.microsoft.com/download/details.aspx?id=53876) from the Microsoft download center.
5959

6060
For scale and performance, we recommend using SqlPackage in most production environments rather than using the Azure portal. For a SQL Server Customer Advisory Team blog about migrating using `BACPAC` files, see [migrating from SQL Server to Azure SQL Database using BACPAC Files](https://blogs.msdn.microsoft.com/sqlcat/2016/10/20/migrating-from-sql-server-to-azure-sql-database-using-bacpac-files/).
6161

articles/storage/common/storage-ref-azcopy-sync.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ Sync a single file:
6161
azcopy sync "/path/to/file.txt" "https://[account].blob.core.windows.net/[container]/[path/to/blob]"
6262
```
6363

64+
> [!NOTE]
65+
> The destination blob *must* exist. Use `azcopy copy` to copy a single file that does not yet exist in the destination. Otherwise, the following error occurs: `Cannot perform sync due to error: sync must happen between source and destination of the same type, e.g. either file <-> file, or directory/container <-> directory/container`.
66+
6467
Same as above, but this time, also compute MD5 hash of the file content and save it as the blob's Content-MD5 property:
6568

6669
```azcopy

0 commit comments

Comments
 (0)