-
Notifications
You must be signed in to change notification settings - Fork 4k
Dev #184
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Conflicts: src/Common/Commands.Common.Storage/packages.config src/Common/Commands.Common.Test/packages.config src/Common/Commands.Common/packages.config src/Common/Commands.Profile/packages.config src/Common/Commands.ScenarioTest/packages.config src/Common/Commands.ScenarioTests.Common/packages.config src/ResourceManager/Batch/Commands.Batch.Test/packages.config src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config src/ResourceManager/DataFactories/Commands.DataFactories/packages.config src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.csproj src/ResourceManager/Insights/Commands.Insights.Test/packages.config src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj src/ResourceManager/Insights/Commands.Insights/packages.config src/ResourceManager/KeyVault/Commands.KeyVault.Test/packages.config src/ResourceManager/KeyVault/Commands.KeyVault/packages.config src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config src/ResourceManager/Resources/Commands.Resources.Test/packages.config src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceClient.cs src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourcesBaseCmdlet.cs src/ResourceManager/Sql/Commands.Sql/packages.config src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config src/ResourceManager/Tags/Commands.Tags/packages.config src/ServiceManagement/Automation/Commands.Automation.Test/packages.config src/ServiceManagement/Automation/Commands.Automation/packages.config src/ServiceManagement/Compute/Commands.ServiceManagement.Extensions.Test/packages.config src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/packages.config src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/packages.config src/ServiceManagement/Compute/Commands.ServiceManagement.Test/packages.config src/ServiceManagement/Compute/Commands.ServiceManagement/packages.config src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/packages.config src/ServiceManagement/HDInsight/Commands.HDInsight.Test/packages.config src/ServiceManagement/HDInsight/Commands.HDInsight/packages.config src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/packages.config src/ServiceManagement/ManagedCache/Commands.ManagedCache/packages.config src/ServiceManagement/Network/Commands.Network.Test/packages.config src/ServiceManagement/Network/Commands.Network/packages.config src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/packages.config src/ServiceManagement/Services/Commands.Test.Utilities/packages.config src/ServiceManagement/Services/Commands.Test/packages.config src/ServiceManagement/Services/Commands.Utilities/packages.config src/ServiceManagement/Services/Commands/packages.config src/ServiceManagement/Sql/Commands.SqlDatabase.Test/packages.config src/ServiceManagement/Sql/Commands.SqlDatabase/packages.config src/ServiceManagement/StorSimple/Commands.StorSimple.Test/packages.config src/ServiceManagement/StorSimple/Commands.StorSimple/Commands.StorSimple.csproj src/ServiceManagement/StorSimple/Commands.StorSimple/packages.config src/ServiceManagement/Storage/Commands.Storage.Test/packages.config src/ServiceManagement/Storage/Commands.Storage/packages.config src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/packages.config src/ServiceManagement/TrafficManager/Commands.TrafficManager/packages.config
Can one of the admins verify this patch? |
Hi @chadiel, I'm your friendly neighborhood Azure Pull Request Bot (You can call me AZPRBOT). Thanks for your contribution!
TTYL, AZPRBOT; |
@chadiel please pull from upstream dev and resolve merge conflicts |
I did before sending the CR – am I missing something? C:\GitHub\chadiel\azure-powershell C:\GitHub\chadiel\azure-powershell C:\GitHub\chadiel\azure-powershell Thanks, Shadi Majed El Hajj Sleiman From: amarzavery [mailto:notifications@github.com] @chadielhttps://github.com/chadiel please pull from upstream dev and resolve merge conflicts — |
@chadiel do |
Conflicts: src/ServiceManagement/StorSimple/Commands.StorSimple.Test/App.config
Done From: Abdelrahman Elogeel [mailto:notifications@github.com] @chadielhttps://github.com/chadiel do git pull upstream dev that should make it — |
@azuresdkci add to whitelist |
@@ -166,6 +165,7 @@ | |||
</EmbeddedResource> | |||
</ItemGroup> | |||
<ItemGroup> | |||
<None Include="app.config" /> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remove app.config
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
Updated the CR and addressed all comments - could you please review and merge this pull request? |
Hi @chadiel, I'm your friendly neighborhood Azure Pull Request Bot (You can call me AZPRBOT). Thanks for your contribution!
TTYL, AZPRBOT; |
Addressed all CR comments - please review |
Seems like the merge job has a bug in it? It fails w/ access denied... Deleting project workspace... Cannot delete workspace: remote file operation failed: D:/workspace/azure-powershell at hudson.remoting.Channel@1e3d2b3:slave-1: java.nio.file.AccessDeniedException: D:\workspace\azure-powershell\src\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.Tasks.dll |
@chadiel the PR still have merge conflicts |
Conflicts: src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/packages.config src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/packages.config
Jobs base and IaaSVM DCs and basic translation
Adds the following cmdlets:
Get-AzureProvider
Register-AzureProvider
Unregister-AzureProvider
Get-AzureProviderFeature
Register-AzureProviderFeature