Skip to content

Conversation

@eshaparmar
Copy link
Contributor

This is in continuation to the PR #673 New functionality for DSC Extension - Publish-AzureVMDscConfiguration cmdlet.
Note that this branch already has got latest from azure branch - release-0.9.6

eshaparmar and others added 24 commits July 20, 2015 14:01
…DSC tests to commands.servicemanagement.test
Conflicts:
	src/Common/Commands.Common/Properties/Resources.resx
…s as they fail in the build system but work locally
version update and changelog for 0.9.6 release
…ntry from the azure powershell test targets file
fix a bad merge on posh solution file which causes recovery commands not load
Conflicts:
	src/AzurePowershell.sln
	src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.dll-Help.xml
@azurecla
Copy link

azurecla commented Aug 3, 2015

Hi @eshaparmar, I'm your friendly neighborhood Azure Pull Request Bot (You can call me AZPRBOT). Thanks for your contribution!


It looks like you're working at Microsoft (esparmar). If you're full-time, we DON'T require a contribution license agreement.



If you are a vendor, or work for Microsoft Open Technologies, DO please sign the electronic contribution license agreement. It will take 2 minutes and there's no faxing! https://cla.azure.com.

TTYL, AZPRBOT;

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i assume removing this is expected, right

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

@yugangw-msft
Copy link
Contributor

did you copy the source code from the release branch? rather just branch from the dev branch? If yes, please do not do that, as this will conflict with our integration from master back the dev branch

@eshaparmar
Copy link
Contributor Author

Yes, I had to merge the code from release-0.9.6 branch as Dev branch was broken.

…dsc_release-0.9.7

Conflicts:
	src/ServiceManagement/Compute/Commands.ServiceManagement.Extensions.Test/Commands.ServiceManagement.Extensions.Test.csproj
	src/ServiceManagement/Compute/Commands.ServiceManagement.Extensions.Test/packages.config
@eshaparmar
Copy link
Contributor Author

Yes fake one

yugangw-msft added a commit that referenced this pull request Aug 4, 2015
New functionality for DSC Extension - Publish-AzureVMDscConfiguration cmdlet
@yugangw-msft yugangw-msft merged commit fca68c8 into Azure:dev Aug 4, 2015
@eshaparmar eshaparmar deleted the dsc_release-0.9.7 branch August 21, 2015 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants