Skip to content

Commit 35468ac

Browse files
author
REDMOND\chanwan
committed
Merge branch 'preview' of https://github.com/Azure/azure-powershell into preview
2 parents 82463e5 + 0dfe254 commit 35468ac

File tree

236 files changed

+143623
-446133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+143623
-446133
lines changed

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ on_success:
2424
- cd %TEMP%\Azure
2525
- ps: ls C:\docs -dir | % { copy $_.FullName . -Recurse -Force }
2626
- git add -A
27-
- git diff --quiet --exit-code --cached || git commit -m "Sync docs from source code repo to content repo." && git push origin %target_branch% -f && appveyor AddMessage "Content Updated"
27+
- git diff --quiet --exit-code --cached || git commit -m "Sync docs from source code repo to content repo." && git push origin %source_branch%:%target_branch% -f && appveyor AddMessage "Content Updated"

documentation/migration-guides/migration-guide.6.0.0.md

Lines changed: 509 additions & 0 deletions
Large diffs are not rendered by default.

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll-help.Help.pshproj

Lines changed: 0 additions & 9024 deletions
This file was deleted.

src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll-help.psd1

Lines changed: 0 additions & 107 deletions
This file was deleted.

src/ResourceManager/ApiManagement/Commands.ApiManagement/Microsoft.Azure.Commands.ApiManagement.dll-help.Help.pshproj

Lines changed: 0 additions & 1740 deletions
This file was deleted.

src/ResourceManager/ApiManagement/Commands.ApiManagement/Microsoft.Azure.Commands.ApiManagement.dll-help.psd1

Lines changed: 0 additions & 107 deletions
This file was deleted.

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/Set-AzureRmApiManagementPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ This command sets the product-scope policy for API Management.
6464
### Example 3: Set API-scope policy
6565
```
6666
PS C:\>$apimContext = New-AzureRmApiManagementContext -ResourceGroupName "Api-Default-WestUS" -ServiceName "contoso"
67-
PS C:\>Get-AzureRmApiManagementPolicy -Context $apimContext -ApiId "9876543210" -Policy $PolicyString
67+
PS C:\>Set-AzureRmApiManagementPolicy -Context $apimContext -ApiId "9876543210" -Policy $PolicyString
6868
```
6969

7070
This command sets API-scope policy for API Management.

src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights/Commands.ApplicationInsights.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@
8484
<Link>AzureRM.ApplicationInsights.psd1</Link>
8585
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
8686
</None>
87-
<None Include="Microsoft.Azure.Commands.ApplicationInsights.dll-Help.psd1">
88-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
89-
</None>
9087
<None Include="Microsoft.Azure.Commands.ApplicationInsights.format.ps1xml">
9188
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9289
<SubType>Designer</SubType>

src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights/Microsoft.Azure.Commands.ApplicationInsights.dll-Help.psd1

Lines changed: 0 additions & 111 deletions
This file was deleted.

0 commit comments

Comments
 (0)