Skip to content

Integrating from master to dev as a part of Release 0.9.5 #630

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 52 commits into from
Jul 20, 2015
Merged

Integrating from master to dev as a part of Release 0.9.5 #630

merged 52 commits into from
Jul 20, 2015

Conversation

amarzavery
Copy link
Contributor

No description provided.

ms-alguerra and others added 30 commits July 10, 2015 14:38
@ms-alguerra
Adding Endpoints
8c9a0e4
@ms-alguerra
Addressing comments
25b3827
@ms-alguerra
Updating again sln
cb5508d
@ms-alguerra
Fixing tests
71760f8
@ms-alguerra
Restoring sln version
5c22301
@ms-alguerra
Adding resourceGroup when listing
6400f21
@ms-alguerra
Adding a bunch of tests
aa30ba3
@ms-alguerra
Adding session records
3ed40f7
@ms-alguerra
Updating changelog
7318a03
@yoavrubin
Adding storage v2 support to Sql audit cmdlets
ad68185
@yoavrubin
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
89a9293
@yoavrubin
Adding test of support of storage v2
6e9ed40
@yoavrubin
removing unneeded line in config + cleanup
33be4af
@yoavrubin
Removing initialization of storageV2 client
dff1455
@yoavrubin
Changes due to build break
39c899e
@yoavrubin
Updating version
c9c4242
@yoavrubin
Re-adding storage v2 client
e933dfb
@yoavrubin
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
417ed60
@yoavrubin
Updated build and changelog
894b36e
@yoavrubin
Updating wxi
a6e4ed7
@vladca
Merge pull request #1 from t-alguer/dev
4318727 
Merging so I can fix PR to Azure\azure-powershel:dev
@yoavrubin
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
790b328
@yoavrubin
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
f760368
@huangpf
Merge pull request #51 from Azure/dev
2855dc0 
.
@markcowl
Updating version to 0.9.5
e74c38f
@vladca
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
f436eaf
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
3d79512
Merge branch 'dev' of https://github.com/vladca/azure-powershell into…
d30d6ac 
… dev
@markcowl
Merge pull request #606 from markcowl/release-0.9.5
363c87d 
Updating version to 0.9.5
@ailn
upgraded resource Microsoft.Azure.Management.Resources to 2.18.1-preview
2b84a78
ailn and others added 22 commits July 14, 2015 18:48
@ailn
always check after nuget package manager!!!
44afa88
@ailn
removed app.config
f74237d
@yoavrubin
Merge branch 'release-0.9.5' of https://github.com/Azure/azure-powers…
abfb937 
…hell into dev
@stankovski
Merge pull request #610 from ailn/dev
6c51fec 
upgraded resource Microsoft.Azure.Management.Resources to 2.18.1-preview
Re-run tests that fail on Jenkins and update session records but no r…
1032483 
…elevant change detected
@yoavrubin
Merge branch 'release-0.9.5' of https://github.com/Azure/azure-powers…
f48508d 
…hell into dev

2bea29cec4090e.

Conflicts:
	setup/azurecmdfiles.wxi
Return type were internal making them public
6d80faf
Merge branch 'dev' into rel095_tm
4516147
Fix ProjectGUID for ResourcesManagement.Automation.Test.csproj in res…
39ed970 
…ourceManager.sln
@deepakswifty
RouteNextHopTypeFix
009e568
@yoavrubin
Merge branch 'release-0.9.5' of https://github.com/Azure/azure-powers…
3cb95db 
…hell into dev

Conflicts:
	ChangeLog.txt
@markcowl
Fixing changelog formatting and wxi file deletions
c2f2b1f
@yoavrubin
Merge pull request #1 from markcowl/release-0.9.5
ebf7ddb 
Fixing changelog formatting and wxi file deletions
@markcowl
Merge pull request #618 from DeepakRajendranMsft/RouteNextHopTypeFix
5ead947 
RouteNextHopTypeFix
@markcowl
Merge pull request #616 from vladca/rel095_tm
179166f 
TrafficManager Endpoint management cmdlets
@markcowl
Updated changelog
aadc3c1
@yoavrubin
Merge pull request #2 from markcowl/release-0.9.5
10a4115 
Release 0.9.5
@markcowl
Merge pull request #615 from yoavrubin/dev
300ee8d 
Adding support of storage v2 to Sql auditing
@huangpf
Remove ValidateNotNullOrEmpty for DiskSizeInGB
6a8d431
@huangpf
Merge branch 'release-0.9.5' of https://github.com/Azure/azure-powers…
cae7c15 
…hell into release-0.9.5
@markcowl
Merge pull request #620 from huangpf/release-0.9.5
0dc37e5 
Remove ValidateNotNullOrEmpty for DiskSizeInGB (for the disk attaching use case)
@amarzavery
Merge pull request #628 from Azure/release-0.9.5
f151f39 
Integrating from release to master as a part of Release 0.9.5
amarzavery added a commit that referenced this pull request Jul 20, 2015
@amarzavery
Merge pull request #630 from Azure/master
6d9ac2c 
Integrating from master to dev as a part of Release 0.9.5
@amarzavery amarzavery merged commit 6d9ac2c into dev Jul 20, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@amarzavery @azurecla @ms-alguerra @yoavrubin @vladca @huangpf @markcowl @ailn @stankovski @deepakswifty