Skip to content

Commit d105e53

Browse files
committed
Merge branch 'master' of https://github.com/Microsoft/azure-docs-pr into PrivateDNS1120
2 parents 6808370 + d493d5f commit d105e53

17 files changed

+82
-25
lines changed

articles/container-instances/container-instances-quickstart.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.devlang: na
1515
ms.topic: quickstart
1616
ms.tgt_pltfrm: na
1717
ms.workload: na
18-
ms.date: 11/17/2017
18+
ms.date: 11/20/2017
1919
ms.author: seanmck
2020
ms.custom: mvc
2121
---
@@ -29,7 +29,7 @@ If you don't have an Azure subscription, create a [free account](https://azure.m
2929

3030
[!INCLUDE [cloud-shell-try-it.md](../../includes/cloud-shell-try-it.md)]
3131

32-
You can use the Azure Cloud Shell or a local installation of the Azure CLI to complete this quickstart. If you choose to install and use the CLI locally, this quickstart requires that you are running the Azure CLI version 2.0.20 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI 2.0]( /cli/azure/install-azure-cli).
32+
You can use the Azure Cloud Shell or a local installation of the Azure CLI to complete this quickstart. If you choose to install and use the CLI locally, this quickstart requires that you are running the Azure CLI version 2.0.21 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI 2.0]( /cli/azure/install-azure-cli).
3333

3434
## Create a resource group
3535

@@ -90,9 +90,10 @@ az container logs --name mycontainer --resource-group myResourceGroup
9090
Output:
9191

9292
```bash
93-
listening on port 80
94-
::ffff:10.240.255.105 - - [21/Jul/2017:00:01:46 +0000] "GET / HTTP/1.1" 200 1663 "-" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36"
95-
::ffff:10.240.255.105 - - [21/Jul/2017:00:01:46 +0000] "GET /favicon.ico HTTP/1.1" 404 150 "http://104.210.39.122/" "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.115 Safari/537.36"
93+
Server running...
94+
10.240.255.107 - - [20/Nov/2017:19:16:28 +0000] "GET / HTTP/1.1" 200 1663 "" "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.94 Safari/537.36"
95+
10.240.255.107 - - [20/Nov/2017:19:16:28 +0000] "GET / HTTP/1.1" 200 1663
96+
10.240.255.107 - - [20/Nov/2017:19:16:28 +0000] "GET /favicon.ico HTTP/1.1" 404 19
9697
```
9798

9899
## Delete the container

articles/container-instances/container-instances-tutorial-deploy-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.devlang: azurecli
1515
ms.topic: tutorial
1616
ms.tgt_pltfrm: na
1717
ms.workload: na
18-
ms.date: 11/17/2017
18+
ms.date: 11/20/2017
1919
ms.author: seanmck
2020
ms.custom: mvc
2121
---
@@ -31,7 +31,7 @@ This is the last of a three-part tutorial. In previous sections, [a container im
3131
3232
## Before you begin
3333

34-
This tutorial requires that you are running the Azure CLI version 2.0.20 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI 2.0](/cli/azure/install-azure-cli).
34+
This tutorial requires that you are running the Azure CLI version 2.0.21 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI 2.0](/cli/azure/install-azure-cli).
3535

3636
To complete this tutorial, you need a Docker development environment. Docker provides packages that easily configure Docker on any [Mac](https://docs.docker.com/docker-for-mac/), [Windows](https://docs.docker.com/docker-for-windows/), or [Linux](https://docs.docker.com/engine/installation/#supported-platforms) system.
3737

articles/container-instances/container-instances-tutorial-prepare-acr.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.devlang: azurecli
1515
ms.topic: tutorial
1616
ms.tgt_pltfrm: na
1717
ms.workload: na
18-
ms.date: 11/07/2017
18+
ms.date: 11/20/2017
1919
ms.author: seanmck
2020
ms.custom: mvc
2121
---
@@ -35,7 +35,7 @@ In subsequent tutorials, you deploy the container from your private registry to
3535

3636
## Before you begin
3737

38-
This tutorial requires that you are running the Azure CLI version 2.0.20 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI 2.0](/cli/azure/install-azure-cli).
38+
This tutorial requires that you are running the Azure CLI version 2.0.21 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI 2.0](/cli/azure/install-azure-cli).
3939

4040
To complete this tutorial, you need a Docker development environment. Docker provides packages that easily configure Docker on any [Mac](https://docs.docker.com/docker-for-mac/), [Windows](https://docs.docker.com/docker-for-windows/), or [Linux](https://docs.docker.com/engine/installation/#supported-platforms) system.
4141

articles/container-instances/container-instances-tutorial-prepare-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.devlang: na
1515
ms.topic: tutorial
1616
ms.tgt_pltfrm: na
1717
ms.workload: na
18-
ms.date: 11/07/2017
18+
ms.date: 11/20/2017
1919
ms.author: seanmck
2020
ms.custom: mvc
2121
---
@@ -33,7 +33,7 @@ In subsequent tutorials, you upload your image to an Azure Container Registry, a
3333

3434
## Before you begin
3535

36-
This tutorial requires that you are running the Azure CLI version 2.0.20 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI 2.0](/cli/azure/install-azure-cli).
36+
This tutorial requires that you are running the Azure CLI version 2.0.21 or later. Run `az --version` to find the version. If you need to install or upgrade, see [Install Azure CLI 2.0](/cli/azure/install-azure-cli).
3737

3838
This tutorial assumes a basic understanding of core Docker concepts such as containers, container images, and basic `docker` commands. If needed, see [Get started with Docker]( https://docs.docker.com/get-started/) for a primer on container basics.
3939

articles/cosmos-db/cassandra-introduction.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.workload: data-services
1212
ms.tgt_pltfrm: na
1313
ms.devlang: na
1414
ms.topic: article
15-
ms.date: 11/15/2017
15+
ms.date: 11/20/2017
1616
ms.author: govindk
1717
---
1818

@@ -75,7 +75,7 @@ If you already have an Azure subscription, you can sign up to join the Cassandra
7575

7676
Once you submit the request, the status changes to **Pending approval** in the New account pane.
7777

78-
After you submit your request, wait for email notification that your request has been approved. You do not need to create a support ticket to complete the request. Requests will be reviewed in the order in which they were received.
78+
After you submit your request, wait for email notification that your request has been approved. Due to the high volume of requests, you should receive notification within a week. You do not need to create a support ticket to complete the request. Requests will be reviewed in the order in which they were received.
7979

8080
## How to get started
8181
Once you've joined the preview program, follow the Cassandra API quickstarts to create an app by using the Cassandra API:

articles/cosmos-db/create-table-dotnet.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ If you don’t already have Visual Studio 2017 installed, you can download and u
3232

3333
## Create a database account
3434

35+
> [!IMPORTANT]
36+
> You need to create a new Table API account to work with the generally available Table API SDKs. Table API accounts created during preview are not supported by the generally available SDKs.
37+
>
38+
3539
[!INCLUDE [cosmos-db-create-dbaccount-table](../../includes/cosmos-db-create-dbaccount-table.md)]
3640

3741
## Add a table
@@ -91,7 +95,7 @@ Now go back to the Azure portal to get your connection string information and co
9195
4. Paste the PRIMARY CONNECTION STRING from the portal into the StorageConnectionString value on line 8. Paste the string inside the quotes.
9296

9397
> [!IMPORTANT]
94-
> If your Endpoint uses documents.azure.com, that means you have a preview acct, and you need to create a [new Table API account](#create-a-database-account) to work with the generally available Table API SDK.
98+
> If your Endpoint uses documents.azure.com, that means you have a preview account, and you need to create a [new Table API account](#create-a-database-account) to work with the generally available Table API SDK.
9599
>
96100

97101
Line 8 should now look similar to:

articles/cosmos-db/create-table-java.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ In addition:
4141

4242
## Create a database account
4343

44+
> [!IMPORTANT]
45+
> You need to create a new Table API account to work with the generally available Table API SDKs. Table API accounts created during preview are not supported by the generally available SDKs.
46+
>
47+
4448
[!INCLUDE [cosmos-db-create-dbaccount-table](../../includes/cosmos-db-create-dbaccount-table.md)]
4549

4650
## Add a table
@@ -98,7 +102,7 @@ Now go back to the Azure portal to get your connection string information and co
98102
6. Paste your PRIMARY CONNECTION STRING from the portal into the StorageConnectionString value in line 2.
99103

100104
> [!IMPORTANT]
101-
> If your Endpoint uses documents.azure.com, that means you have a preview acct, and you need to create a [new Table API account](#create-a-database-account) to work with the generally available Table API SDK.
105+
> If your Endpoint uses documents.azure.com, that means you have a preview account, and you need to create a [new Table API account](#create-a-database-account) to work with the generally available Table API SDK.
102106
>
103107

104108
7. Save the config.properties file.

articles/cosmos-db/create-table-nodejs.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ In addition:
3636

3737
## Create a database account
3838

39+
> [!IMPORTANT]
40+
> You need to create a new Table API account to work with the generally available Table API SDKs. Table API accounts created during preview are not supported by the generally available SDKs.
41+
>
42+
3943
[!INCLUDE [cosmos-db-create-dbaccount-table](../../includes/cosmos-db-create-dbaccount-table.md)]
4044

4145
## Add a table
@@ -84,7 +88,7 @@ Now go back to the Azure portal to get your connection string information and co
8488
3. Open the app.config file, and paste the value into the connectionString on line three.
8589

8690
> [!IMPORTANT]
87-
> If your Endpoint uses documents.azure.com, that means you have a preview acct, and you need to create a [new Table API account](#create-a-database-account) to work with the generally available Table API SDK.
91+
> If your Endpoint uses documents.azure.com, that means you have a preview account, and you need to create a [new Table API account](#create-a-database-account) to work with the generally available Table API SDK.
8892
>
8993

9094
3. Save the app.config file.

articles/cosmos-db/create-table-python.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ In addition:
3636

3737
## Create a database account
3838

39+
> [!IMPORTANT]
40+
> You need to create a new Table API account to work with the generally available Table API SDKs. Table API accounts created during preview are not supported by the generally available SDKs.
41+
>
42+
3943
[!INCLUDE [cosmos-db-create-dbaccount-table](../../includes/cosmos-db-create-dbaccount-table.md)]
4044

4145
## Add a table

articles/cosmos-db/table-introduction.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: data-services
1313
ms.tgt_pltfrm: na
1414
ms.devlang: na
1515
ms.topic: get-started-article
16-
ms.date: 11/15/2017
16+
ms.date: 11/20/2017
1717
ms.author: mimig1
1818

1919
---
@@ -53,6 +53,10 @@ If you currently use Azure Table Storage, you gain the following benefits by mov
5353

5454
Create an Azure Cosmos DB account in the [Azure portal](https://portal.azure.com). Then get started with our [Quick Start for Table API by using .NET](create-table-dotnet.md).
5555

56+
> [!IMPORTANT]
57+
> If you created a Table API account during the preview, please create a [new Table API account](create-table-dotnet.md#create-a-database-account) to work with the generally available Table API SDKs.
58+
>
59+
5660
## Next steps
5761

5862
Here are a few pointers to get you started:

articles/cosmos-db/table-sdk-dotnet.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: data-services
1313
ms.tgt_pltfrm: na
1414
ms.devlang: dotnet
1515
ms.topic: article
16-
ms.date: 11/17/2017
16+
ms.date: 11/20/2017
1717
ms.author: mimig
1818

1919
---
@@ -32,6 +32,10 @@ ms.author: mimig
3232
|**Tutorial**|[Azure Cosmos DB: Develop with the Table API in .NET](tutorial-develop-table-dotnet.md)|
3333
|**Current supported framework**|[Microsoft .NET Framework 4.5](https://www.microsoft.com/download/details.aspx?id=30653)|
3434

35+
> [!IMPORTANT]
36+
> If you created a Table API account during the preview, please create a [new Table API account](create-table-dotnet.md#create-a-database-account) to work with the generally available Table API SDKs.
37+
>
38+
3539
## Release notes
3640

3741
### <a name="1.0.0"/>1.0.0
@@ -61,6 +65,7 @@ If you get the error
6165
Unable to resolve dependency 'Microsoft.Azure.Storage.Common'. Source(s) used: 'nuget.org',
6266
'CliFallbackFolder', 'Microsoft Visual Studio Offline Packages', 'Microsoft Azure Service Fabric SDK'`
6367
```
68+
6469
when attempting to use the Microsoft.Azure.CosmosDB.Table NuGet package, you have two options to fix the issue:
6570

6671
* Use Package Manage Console to install the Microsoft.Azure.CosmosDB.Table package and its dependencies. To do this, type the following in the Package Manager Console for your solution.
@@ -71,6 +76,7 @@ when attempting to use the Microsoft.Azure.CosmosDB.Table NuGet package, you hav
7176
* Using your preferred Nuget package management tool, install the Microsoft.Azure.Storage.Common Nuget package before installing Microsoft.Azure.CosmosDB.Table.
7277
7378
## FAQ
79+
7480
[!INCLUDE [cosmos-db-sdk-faq](../../includes/cosmos-db-sdk-faq.md)]
7581
7682
## See also

articles/cosmos-db/table-sdk-java.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: data-services
1313
ms.tgt_pltfrm: na
1414
ms.devlang: java
1515
ms.topic: article
16-
ms.date: 11/15/2017
16+
ms.date: 11/20/2017
1717
ms.author: yaronyg
1818
ms.custom:
1919

@@ -32,6 +32,10 @@ ms.custom:
3232
|**API documentation**|[Java API reference documentation](http://azure.github.io/azure-storage-java/)|
3333
|**Contribute to SDK**|[GitHub](https://github.com/Azure/azure-storage-java#contribute-code-or-provide-feedback)|
3434

35+
> [!IMPORTANT]
36+
> If you created a Table API account during the preview, please create a [new Table API account](create-table-dotnet.md#create-a-database-account) to work with the generally available Table API SDKs.
37+
>
38+
3539
## Release notes
3640

3741
### <a name="1.0.0"/>1.0.0

articles/cosmos-db/table-sdk-nodejs.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: data-services
1313
ms.tgt_pltfrm: na
1414
ms.devlang: nodejs
1515
ms.topic: article
16-
ms.date: 11/15/2017
16+
ms.date: 11/20/2017
1717
ms.author: yaronyg
1818
ms.custom:
1919

@@ -32,6 +32,10 @@ ms.custom:
3232
|**API documentation**|[Node.js API reference documentation](http://azure.github.io/azure-storage-node/)|
3333
|**Contribute to SDK**|[GitHub](https://github.com/Azure/azure-storage-node#contribute)|
3434

35+
> [!IMPORTANT]
36+
> If you created a Table API account during the preview, please create a [new Table API account](create-table-dotnet.md#create-a-database-account) to work with the generally available Table API SDKs.
37+
>
38+
3539
## Release notes
3640

3741
### <a name="1.0.0"/>1.0.0

articles/cosmos-db/table-sdk-python.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.workload: data-services
1313
ms.tgt_pltfrm: na
1414
ms.devlang: python
1515
ms.topic: article
16-
ms.date: 11/15/2017
16+
ms.date: 11/20/2017
1717
ms.author: mimig1
1818
ms.custom:
1919

@@ -34,6 +34,9 @@ ms.custom:
3434
|**Contribute to SDK**|[GitHub](https://github.com/Azure/azure-cosmosdb-python/tree/master/azure-cosmosdb-table)|
3535
|**Current supported platform**|[Python 2.7](https://www.python.org/downloads/) or [Python 3.3, 3.4, 3.5, or 3.6] (https://www.python.org/downloads/)|
3636

37+
> [!IMPORTANT]
38+
> If you created a Table API account during the preview, please create a [new Table API account](create-table-dotnet.md#create-a-database-account) to work with the generally available Table API SDKs.
39+
>
3740
3841
## Release notes
3942

articles/cosmos-db/tutorial-develop-table-dotnet.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ Now go back to the Azure portal to get your connection string information and co
111111
4. Paste the PRIMARY CONNECTION STRING from the portal into the StorageConnectionString value on line 8. Paste the string inside the quotes.
112112

113113
> [!IMPORTANT]
114-
> If your Endpoint uses documents.azure.com, that means you have a preview acct, and you need to create a [new Table API account](#create-a-database-account) to work with the generally available Table API SDK.
114+
> If your Endpoint uses documents.azure.com, that means you have a preview account, and you need to create a [new Table API account](#create-a-database-account) to work with the generally available Table API SDK.
115115
>
116116

117117
Line 8 should now look similar to:

articles/data-factory/quickstart-create-data-factory-powershell.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ In this step, you set values for the pipeline parameters: **inputPath** and **o
351351
Write-Host "Pipeline is running...status: InProgress" -foregroundcolor "Yellow"
352352
}
353353
354-
Start-Sleep -Seconds 30
354+
Start-Sleep -Seconds 10
355355
}
356356
```
357357
@@ -374,7 +374,26 @@ In this step, you set values for the pipeline parameters: **inputPath** and **o
374374
Message :
375375
```
376376
377-
2. Run the following script to retrieve copy activity run details, for example, size of the data read/written.
377+
If you see the error:
378+
```
379+
Activity CopyFromBlobToBlob failed: Failed to detect region of linked service 'AzureStorage' : 'AzureStorageLinkedService' with error '[Region Resolver] Azure Storage failed to get address for DNS. Warning: System.Net.Sockets.SocketException (0x80004005): No such host is known
380+
```
381+
do the following steps:
382+
1. In the AzureStorageLinkedService.json, confirm that the name and key of your Azure Storage Account are correct.
383+
2. Verify that the format of the connection string is correct. The properties, for example, AccountName and AccountKey are separated by semi-colon (`;`) character.
384+
3. If you have angled brackets surrounding the account name and account key, remove them.
385+
4. Here is an example connection string:
386+
387+
```json
388+
"connectionString": {
389+
"value": "DefaultEndpointsProtocol=https;AccountName=mystorageaccountname;AccountKey=mystorageacountkey;EndpointSuffix=core.windows.net",
390+
"type": "SecureString"
391+
}
392+
```
393+
5. Recreate the linked service by following steps in the [Create a linked service](#create-a-linked-service) section.
394+
6. Rerun the pipeline by following steps in the [Create a pipeline run](#create-a-pipeline-run) section.
395+
7. Run the current monitoring command again to monitor the new pipeline run.
396+
1. Run the following script to retrieve copy activity run details, for example, size of the data read/written.
378397
379398
```powershell
380399
Write-Host "Activity run details:" -foregroundcolor "Yellow"

articles/machine-learning/preview/how-to-use-jupyter-notebooks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ms.date: 11/09/2017
1616
Azure Machine Learning Workbench supports interactive data science experimentation via its integration of Jupyter notebook. This article describes how to make effective use of this feature to increase the rate and the quality of your interactive data science experimentation.
1717

1818
## Prerequisites
19-
- [Install and create Azure Machine Learning](/machine-learning/preview/quickstart-installation.md).
19+
- [Install and create Azure Machine Learning](quickstart-installation.md).
2020
- Be familiar with [Jupyter notebook](http://jupyter.org/), since this article is not about teaching how to use Jupyter.
2121

2222
## Jupyter notebook architecture

0 commit comments

Comments
 (0)