Commit c4cd95f

REDMOND\v-ajnava

committed

Merge branch 'AJ_power1' of https://github.com/v-Ajnava/azure-powershell into AJ_power1

# Conflicts: # setup/azurecmdfiles.wxi # src/ResourceManager/EventHub/Commands.EventHub.Test/Commands.EventHubs.Test.csproj # src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/NamespaceTests.ps1 # src/ResourceManager/EventHub/Commands.EventHub.Test/SessionRecords/Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.ConsumerGroupsTests/ConsumerGroupsCRUD.json # src/ResourceManager/EventHub/Commands.EventHub.Test/SessionRecords/Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.EventHubsTests/EventHubsAuthorizationRulesCRUD.json # src/ResourceManager/EventHub/Commands.EventHub.Test/SessionRecords/Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.EventHubsTests/EventHubsCRUD.json # src/ResourceManager/EventHub/Commands.EventHub.Test/SessionRecords/Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.NamespaceTests/NamespaceAuthorizationRulesCRUD.json # src/ResourceManager/EventHub/Commands.EventHub.Test/SessionRecords/Microsoft.Azure.Commands.EventHub.Test.ScenarioTests.NamespaceTests/NamespaceCRUD.json

2 parents 0001c62 + 1eb3f3b commit c4cd95fCopy full SHA for c4cd95f

2 files changed

+7088

-245

lines changed

AzurePowershell.Test.targets
setup
- azurecmdfiles.wxi

2 files changed

+7088

-245

lines changed

`‎AzurePowershell.Test.targets`

Original file line number	Diff line number	Diff line change
`@@ -527,4 +527,3 @@`
`527`	`527`
`528`	`528`
`529`	`529`	`</Project>`
`530`		`-`

Comments

(0)