Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' of github.com:Azure/azure-powershell into dev
Conflicts: ChangeLog.txt build.proj setup/azurecmd.wxs src/Common/Commands.Common.Test/Commands.Common.Test.csproj src/Common/Commands.Common.Test/Common/ProfileCmdltsTests.cs src/Common/Commands.Common.Test/packages.config src/Common/Commands.Common/Authentication/ProtectedFileTokenCache.cs src/Common/Commands.Common/Common/AzurePowerShell.cs src/Common/Commands.Common/Common/ProfileClient.cs src/Common/Commands.Common/XmlSchema/ServiceConfigurationSchema.cs src/Common/Commands.Common/XmlSchema/ServiceDefinitionSchema.cs src/Common/Commands.Profile/Microsoft.WindowsAzure.Commands.Profile.dll-Help.xml src/Common/Commands.Profile/Subscription/SelectAzureSubscription.cs src/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj src/Common/Commands.ScenarioTest/WebsitesTests/WebsitesTests.cs src/Common/Commands.ScenarioTest/packages.config src/Common/Commands.ScenarioTests.Common/Commands.ScenarioTests.Common.csproj src/Common/Commands.ScenarioTests.Common/packages.config src/ResourceManager/Batch/Commands.Batch.Test/Commands.Batch.Test.csproj src/ResourceManager/Batch/Commands.Batch.Test/packages.config src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/linkedService.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/pipeline.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/Resources/table.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoryTests.cs src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoryTests.ps1 src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/HubTests.cs src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/HubTests.ps1 src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/LinkedServiceTests.cs src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/LinkedServiceTests.ps1 src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/PipelineTests.cs src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/PipelineTests.ps1 src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/TableTests.cs src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/TableTests.ps1 src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestCreateDataFactory.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestDeleteDataFactoryWithDataFactoryParameter.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestGetDataFactoryWithEmptyName.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestGetDataFactoryWithWhiteSpaceName.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.DataFactoryTests/TestGetNonExistingDataFactory.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.HubTests/TestHub.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.HubTests/TestHubWithDataFactoryParameter.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests/TestGetLinkedServiceWithEmptyName.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests/TestGetLinkedServiceWithWhiteSpaceName.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests/TestLinkedService.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.LinkedServiceTests/TestLinkedServiceWithDataFactoryParameter.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.TableTests/TestGetTableWithEmptyName.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.TableTests/TestGetTableWithWhiteSpaceName.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.TableTests/TestTable.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/SessionRecords/Microsoft.Azure.Commands.DataFactories.Test.TableTests/TestTableWithDataFactoryParameter.json src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewDataFactoryTests.cs src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewLinkedServiceTests.cs src/ResourceManager/DataFactories/Commands.DataFactories.Test/UnitTests/NewTableTests.cs src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj src/ResourceManager/DataFactories/Commands.DataFactories/DataFactories/RemoveAzureDataFactoryCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/DataFactoryCommonUtilities.cs src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/GetAzureDataFactorySliceCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/SaveAzureDataFactoryLog.cs src/ResourceManager/DataFactories/Commands.DataFactories/DataSlices/SetAzureDataFactorySliceStatusCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Encrypt/NewAzureDataFactoryEncryptValueCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Gateway/GetAzureDataFactoryGatewayCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Gateway/NewAzureDataFactoryGatewayCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Gateway/NewAzureDataFactoryGatewayKeyCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Gateway/RemoveAzureDataFactoryGatewayCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Gateway/SetAzureDataFactoryGatewayCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Hubs/GetAzureDataFactoryHubCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Hubs/NewAzureDataFactoryHubCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Hubs/RemoveAzureDataFactoryHubCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/LinkedServices/GetAzureDataFactoryLinkedServiceCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/LinkedServices/LinkedServiceContextBaseCmdlet.cs src/ResourceManager/DataFactories/Commands.DataFactories/LinkedServices/NewAzureDataFactoryLinkedServiceCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/LinkedServices/RemoveAzureDataFactoryLinkedServiceCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Microsoft.Azure.Commands.DataFactories.dll-Help.xml src/ResourceManager/DataFactories/Commands.DataFactories/Microsoft.Azure.Commands.DataFactories.format.ps1xml src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.DataFactories.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Gateway.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Hubs.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.LinkedServices.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Pipelines.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/DataFactoryClient.Tables.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataFactory.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSDataFactoryGateway.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSHub.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSLinkedService.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSPipeline.cs src/ResourceManager/DataFactories/Commands.DataFactories/Models/PSTable.cs src/ResourceManager/DataFactories/Commands.DataFactories/Pipelines/GetAzureDataFactoryPipelineCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Pipelines/NewAzureDataFactoryPipelineCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Pipelines/PipelineContextBaseCmdlet.cs src/ResourceManager/DataFactories/Commands.DataFactories/Pipelines/RemoveAzureDataFactoryPipelineCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Pipelines/ResumeAzureDataFactoryPipelineCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Pipelines/SetAzureDataFactoryPipelineActivePeriodCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Pipelines/SuspendAzureDataFactoryPipelineCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Properties/Resources.Designer.cs src/ResourceManager/DataFactories/Commands.DataFactories/Properties/Resources.resx src/ResourceManager/DataFactories/Commands.DataFactories/Tables/GetAzureDataFactoryTableCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Tables/NewAzureDataFactoryTableCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Tables/RemoveAzureDataFactoryTableCommand.cs src/ResourceManager/DataFactories/Commands.DataFactories/Tables/TableContextBaseCmdlet.cs src/ResourceManager/DataFactories/Commands.DataFactories/packages.config src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTests.ps1 src/ResourceManager/RedisCache/Commands.RedisCache.Test/SessionRecords/Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests/TestCreateExistingRedisCacheTest.json src/ResourceManager/RedisCache/Commands.RedisCache.Test/SessionRecords/Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests/TestRedisCache.json src/ResourceManager/RedisCache/Commands.RedisCache.Test/SessionRecords/Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests/TestRedisCachePipeline.json src/ResourceManager/RedisCache/Commands.RedisCache.Test/SessionRecords/Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests/TestSetNonExistingRedisCacheTest.json src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj src/ResourceManager/RedisCache/Commands.RedisCache/Commands/NewAzureRedisCache.cs src/ResourceManager/RedisCache/Commands.RedisCache/Commands/SetAzureRedisCache.cs src/ResourceManager/RedisCache/Commands.RedisCache/Microsoft.Azure.Commands.RedisCache.dll-Help.xml src/ResourceManager/RedisCache/Commands.RedisCache/Microsoft.Azure.Commands.RedisCache.format.ps1xml src/ResourceManager/RedisCache/Commands.RedisCache/Models/RedisCacheAttributes.cs src/ResourceManager/RedisCache/Commands.RedisCache/Models/RedisCacheAttributesWithAccessKeys.cs src/ResourceManager/RedisCache/Commands.RedisCache/Models/RedisCacheClient.cs src/ResourceManager/RedisCache/Commands.RedisCache/packages.config src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj src/ResourceManager/Resources/Commands.Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceGroupTests/TestAzureTagsEndToEnd.json src/ResourceManager/Resources/Commands.Resources.Test/packages.config src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1 src/ResourceManager/Resources/Commands.Resources/Microsoft.Azure.Commands.Resources.dll-Help.xml src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/Common.ps1 src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SecurityTests.cs src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SecurityTests.ps1 src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestDatabaseDisableEnableKeepProperties.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestDatabaseUpdatePolicyKeepPreviousStorage.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestDatabaseUpdatePolicyWithEventTypeShortcuts.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestDatabaseUpdatePolicyWithEventTypes.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestDatabaseUpdatePolicyWithStorage.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestDisableDatabaseAuditing.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestDisableServerAuditing.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestFailWithBadDatabaseIndentity.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestFailWithBadServerIndentity.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestFailedDatabaseUpdatePolicyWithNoStorage.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestFailedServerUpdatePolicyWithNoStorage.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestFailedUseServerDefault.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestServerDisableEnableKeepProperties.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestServerUpdatePolicyKeepPreviousStorage.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestServerUpdatePolicyWithEventTypeShortcuts.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestServerUpdatePolicyWithEventTypes.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestServerUpdatePolicyWithStorage.json src/ResourceManager/Sql/Commands.Sql.Test/SessionRecords/Microsoft.Azure.Commands.ScenarioTest.SqlTests.SecurityTests/TestUseServerDefault.json src/ResourceManager/Sql/Commands.Sql.Test/packages.config src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj src/ResourceManager/Sql/Commands.Sql/Microsoft.Azure.Commands.Sql.dll-Help.xml src/ResourceManager/Sql/Commands.Sql/Security/Model/AuditingPolicy.cs src/ResourceManager/Sql/Commands.Sql/Security/Model/Constants.cs src/ResourceManager/Sql/Commands.Sql/Security/Services/EndpointsCommunicator.cs src/ResourceManager/Sql/Commands.Sql/Security/Services/SqlClient.cs src/ResourceManager/Sql/Commands.Sql/packages.config src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/PIR.psd1 src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/AzurePreview.psd1 src/ServiceManagement/Compute/Commands.ServiceManagement.Test/AzureRTBVTs.playlist src/ServiceManagement/Compute/Commands.ServiceManagement.Test/AzureRTExtensions.playlist src/ServiceManagement/Compute/Commands.ServiceManagement.Test/AzureRTFull.playlist src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/FunctionalTestCommonVhd.cs src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/IaasCmdletInfo/UpdateAzureVMImageCmdletInfo.cs src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ScenarioTest.cs src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementCmdletTestHelper.cs src/ServiceManagement/Compute/Commands.ServiceManagement.Test/packages.config src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.xml src/ServiceManagement/Compute/Commands.ServiceManagement/Model/OSImageContext.cs src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRoute.psd1 src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/ScenarioTests/ManagedCacheTests.cs src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/ScenarioTests/ManagedCacheTests.ps1 src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/SessionRecords/Microsoft.Azure.Commands.ManagedCache.Test.ScenarioTests.ManagedCacheTests/ManagedCacheEndToEndTest.json src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/packages.config src/ServiceManagement/ManagedCache/Commands.ManagedCache/Microsoft.Azure.Commands.ManagedCache.dll-help.xml src/ServiceManagement/ManagedCache/Commands.ManagedCache/PSCacheClient.cs src/ServiceManagement/Network/Commands.Network.Test/Commands.Network.Test.csproj src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestCreateAndRemoveNSG.json src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestGetMultipleNSGs.json src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestRemoveNSGFromSubnet.json src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestRemoveNSGWithNonExistingName.json src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestRemoveNSR.json src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestSetAndGetNSGForSubnet.json src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestSetNSR.json src/ServiceManagement/Network/Commands.Network.Test/SessionRecords/Microsoft.Azure.Commands.Network.Test.ScenarioTests.NSGScenarioTests/TestSetNSRWithInvalidParameter.json src/ServiceManagement/Network/Commands.Network.Test/packages.config src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/packages.config src/ServiceManagement/Services/Commands.Test/Websites/NewAzureWebSiteTests.cs src/ServiceManagement/Services/Commands.Utilities/Azure.psd1 src/ServiceManagement/Services/Commands.Utilities/Microsoft.WindowsAzure.Commands.dll-Help.xml src/ServiceManagement/Services/Commands.Utilities/Websites/WebsitesClient.cs src/ServiceManagement/Services/Commands/Websites/NewAzureWebSite.cs src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Resources/MockSessions.xml src/ServiceManagement/Storage/Commands.Storage.MsTest2/Properties/AssemblyInfo.cs
- Loading branch information