Merge branch 'dev' of https://github.com/Azure/azure-powershell into AkamaiRelease

Conflicts:
	src/ResourceManager/Cdn/Commands.Cdn/packages.config

Author: Qinyuan Wan

.gitignore

@@ -181,6 +181,10 @@ Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
 
+# The Backup*/ rule will ignore the backup and restore cmdlets
+# for Azure web apps. Exclude that directory from being ignored here.
+!/src/ResourceManager/Websites/Commands.Websites/Cmdlets/BackupRestore
+
 # SQL Server files
 *.mdf
 *.ldf

ChangeLog.md

@@ -1,6 +1,11 @@
-##2016.05.03 version 1.4.0
+##2016.05.04 version 1.4.0
+* Azure Resource Manager
+  - Get-AzureRmLocation cmdley: New cmdlet Lists all public Azure locatiosn with available provider namespaces
+  - Get-AzureRMResourceGroupDeploymentOperations: Improved output format
+  - Get-AzureRMDeployment: Responses contain all error details
+  - Added cmdlet help anbd examples
+  - Normalized cmdlet parameter defaults and position
 * Azure Storage
-  * Upgrade to Microsoft.Azure.Management.Storage nuget package v5.0 preview
   * Add Encryption and Hot/Cool features support to resource mode storage account cmdlets
     - New-AzureRmStorageAccount
     - Set-AzureRmStorageAccount
@@ -14,6 +19,57 @@
     - New-AzureStorageShareSASToken
     - New-AzureStorageShareStoredAccessPolicy
     - Set-AzureStorageShareStoredAccessPolicy
+* Azure Compute
+  * Added cmdlets for Contaner Service support
+  * Bug and help fixes
+* Azure Profile
+  * Added support for German national cloud (AzureGermanCloud)
+* Azure APIManagement
+  *  Added Tenant Git Configuration cmdlets
+    - Get-AzureRmApiManagementTenantGitAccess
+    - Set-AzureRmApiManagementTenantGitAccess
+    - Get-AzureRmApiManagementTenantSyncState
+    - Publish-AzureRmApiManagementTenantGitConfiguration
+    - Save-AzureRmApiManagementTenantGitConfiguration
+  * Added ApiManagement Properties cmdlets
+    - Get-AzureRmApiManagementProperty
+    - New-AzureRmApiManagementProperty
+    - Remove-AzureRmApiManagementProperty
+    - Set-AzureRmApiManagementProperty
+  * Added Logger cmdlets
+    - Get-AzureRmApiManagementLogger
+    - Remove-AzureRmApiManagementLogger
+    - Set-AzureRmApiManagementLogger
+    - New-AzureRmApiManagementLogger
+  * Fixed cmdlet bugs
+    - NewAzureRMApiManagementAPI: changed Path to optional
+    - NewAzureRMApiManagementProduct: fixed issue with creating products without Subscriptions
+* Azure Recovery Services Backup
+  * Added Recovery Services Backup cmdlets
+    - Set-AzureRmRecoveryServicesVaultContext
+    - Set-AzureRmRecoveryServicesBackupProperties
+    - Get-AzureRmRecoveryServicesBackupProperties
+    - Get-AzureRmRecoveryServicesVaultSettingsFile
+    - Backup-AzureRmRecoveryServicesBackupItem
+    - Get-AzureRmRecoveryServicesBackupContainer
+    - Get-AzureRmRecoveryServicesBackupManagementServer
+    - Unregister-AzureRmRecoveryServicesBackupContainer
+    - Unregister-AzureRmRecoveryServicesBackupManagementServer
+    - Disable-AzureRmRecoveryServicesBackupProtection
+    - Enable-AzureRmRecoveryServicesBackupProtection
+    - Get-AzureRmRecoveryServicesBackupItem
+    - Get-AzureRmRecoveryServicesBackupJob
+    - Get-AzureRmRecoveryServicesBackupJobDetails
+    - Stop-AzureRmRecoveryServicesBackupJob
+    - Wait-AzureRmRecoveryServicesBackupJob
+    - Get-AzureRmRecoveryServicesBackupRetentionPolicyObject
+    - Get-AzureRmRecoveryServicesBackupProtectionPolicy
+    - Get-AzureRmRecoveryServicesBackupSchedulePolicyObject
+    - New-AzureRmRecoveryServicesBackupProtectionPolicy
+    - Remove-AzureRmRecoveryServicesBackupProtectionPolicy
+    - Set-AzureRmRecoveryServicesBackupProtectionPolicy
+    - Get-AzureRmRecoveryServicesBackupRecoveryPoint
+    - Restore-AzureRmRecoveryServicesBackupItem
 
 ##2016.04.19 version 1.3.2
 * Add support for specifying NIC/VMSS as application gateway backend address

README.md

@@ -50,7 +50,7 @@ This repository contains a set of PowerShell cmdlets for developers and administ
 
 For detail descriptions and examples of the cmdlets, type
 * ```help azure``` to get all the cmdlets.
-* ```help azurerm``` to get all the Azure Resource Manaber (ARM) cmdlets.
+* ```help azurerm``` to get all the Azure Resource Manager (ARM) cmdlets.
 * ```help <cmdlet name>``` to get the details of a specific cmdlet.
 
 ## Supported Environments
@@ -72,9 +72,9 @@ For detail descriptions and examples of the cmdlets, type
 You can also find the standalone installers for all the versions at [Downloads](https://github.com/Azure/azure-powershell/releases)
 
 ### PowerShell Gallery
-1. Install [Windows Management Framework 5 ot PowerShellGet cmdlets](https://www.powershellgallery.com/GettingStarted?section=Get%20Started)
+1. Install [Windows Management Framework 5 with PowerShellGet cmdlets](https://www.powershellgallery.com/GettingStarted?section=Get%20Started)
 2. In an elevated PowerShell session, run  ```Install-Module AzureRM```
-3. run ```Install-AzureRm```
+3. Run ```Install-AzureRm```
 4. Top install RDFE cmdlets, run ```Install-Module Azure```
 
 ### Source Code

setup/azurecmd.wxs

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
-  <?define productName="Microsoft Azure PowerShell - April 2016" ?>
+  <?define productName="Microsoft Azure PowerShell - May 2016" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="1.3.2" ?>
+  <?define version="1.4.0" ?>
 
   <Product Id="*"
            Name="$(var.productName)"