Skip to content

Commit 8e1ce7c

Browse files
authored
Merge pull request MicrosoftDocs#97816 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 7c26d90 + d400ea4 commit 8e1ce7c

File tree

4 files changed

+58
-55
lines changed

4 files changed

+58
-55
lines changed

articles/key-vault/key-vault-overview.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Azure Key Vault helps solve the following problems:
2121
- **Secrets Management** - Azure Key Vault can be used to Securely store and tightly control access to tokens, passwords, certificates, API keys, and other secrets
2222
- **Key Management** - Azure Key Vault can also be used as a Key Management solution. Azure Key Vault makes it easy to create and control the encryption keys used to encrypt your data.
2323
- **Certificate Management** - Azure Key Vault is also a service that lets you easily provision, manage, and deploy public and private Secure Sockets Layer/Transport Layer Security (SSL/TLS) certificates for use with Azure and your internal connected resources.
24-
- **Store secrets backed by Hardware Security Modules** - The secrets and keys can be protected either by software or FIPS 140-2 Level 2 validates HSMs
24+
- **Store secrets backed by Hardware Security Modules** - The secrets and keys can be protected either by software or FIPS 140-2 Level 2 validated HSMs
2525

2626
## Why use Azure Key Vault?
2727

@@ -55,9 +55,9 @@ You have control over your logs and you may secure them by restricting access an
5555

5656
### Simplified administration of application secrets
5757

58-
When storing valuable data, you must take several steps. Security information must be secured, it must follow a life cycle, it must be highly available. Azure Key Vault simplifies the process of meeting these requirements by:
58+
When storing valuable data, you must take several steps. Security information must be secured, it must follow a life cycle, and it must be highly available. Azure Key Vault simplifies the process of meeting these requirements by:
5959

60-
- Removing the need for in-house knowledge of Hardware Security Modules
60+
- Removing the need for in-house knowledge of Hardware Security Modules.
6161
- Scaling up on short notice to meet your organization’s usage spikes.
6262
- Replicating the contents of your Key Vault within a region and to a secondary region. Data replication ensures high availability and takes away the need of any action from the administrator to trigger the failover.
6363
- Providing standard Azure administration options via the portal, Azure CLI and PowerShell.

articles/machine-learning/studio/deploy-a-machine-learning-web-service.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ For more information about accessing a Machine Learning Studio (classic) web ser
116116

117117
### Manage your New web service
118118

119-
You can manage your New web services Machine Learning Studio (classic) Web Services portal. From the [main portal page](https://services.azureml-test.net/), click **Web Services**. From the web services page, you can delete or copy a service. To monitor a specific service, click the service and then click **Dashboard**. To monitor batch jobs associated with the web service, click **Batch Request Log**.
119+
You can manage your New web services using Machine Learning Studio (classic) Web Services portal. From the [main portal page](https://services.azureml.net/), click **Web Services**. From the web services page, you can delete or copy a service. To monitor a specific service, click the service and then click **Dashboard**. To monitor batch jobs associated with the web service, click **Batch Request Log**.
120120

121121
### <a id="multi-region"></a> Deploy your New web service to multiple regions
122122

articles/storage/blobs/data-lake-storage-upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ This section describes which Data Lake Storage Gen1 platform capabilities that a
7575
| Data Operations – Logs | Yes | Yes | *Available now* (Preview). See [known issues](data-lake-storage-known-issues.md).<br><br> Azure Monitoring integration – *Not yet available* |
7676
| Encryption data at rest | Transparent, Server side with service-managed keys and with customer-managed keys in Azure KeyVault | Transparent, Server side with service-managed keys and with customer keys managed keys in Azure KeyVault | Service-managed keys – *Available now*<br><br> Customer-managed keys – *Available now* |
7777
| Management operations (e.g. Account Create) | [Role-based access control](https://docs.microsoft.com/azure/role-based-access-control/overview) (RBAC) provided by Azure for account management | [Role-based access control](https://docs.microsoft.com/azure/role-based-access-control/overview) (RBAC) provided by Azure for account management | *Available now*|
78-
| Developer SDKs | .NET, Java, Python, Node.js | .NET, Java, Python, Node.js, C++, Ruby, PHP, Go, Android, iOS| Blob SDK - *Available now*. Azure Data Lake Storage Gen2 SDK - *Not yet available* |
78+
| Developer SDKs | .NET, Java, Python, Node.js | .NET, Java, Python, Node.js, C++, Ruby, PHP, Go, Android, iOS| Blob SDK - *Available now*. [Azure Data Lake Storage Gen2 SDK](https://azure.microsoft.com/blog/extended-filesystem-programming-capabilities-in-azure-data-lake-storage/)- *Available now - .NET, Java, Python (public preview)* |
7979
| |Optimized performance for parallel analytics workloads. High Throughput and IOPS. | Optimized performance for parallel analytics workloads. High Throughput and IOPS. | *Available now* |
8080
| Virtual Network (VNet) support | [Using Virtual Network integration](https://docs.microsoft.com/azure/data-lake-store/data-lake-store-network-security) | [Using Service Endpoint for Azure Storage](https://docs.microsoft.com/azure/storage/common/storage-network-security?toc=%2fazure%2fstorage%2fblobs%2ftoc.json) | *Available now* |
8181
| Size limits | No limits on account sizes, file sizes or number of files | No limits on account sizes or number of files. File size limited to 5TB. | *Available now*|

0 commit comments

Comments
 (0)