Skip to content
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

Merging with main fork #5

Merged
merged 107 commits into from
May 24, 2012
Merged

Merging with main fork #5

merged 107 commits into from
May 24, 2012

Conversation

andrerod
Copy link

Aligning project structure so that we make sure serializers / etc are in sync

jcookems and others added 30 commits May 4, 2012 22:16
…p into blobFunctional

Conflicts:
	tests/WindowsAzureTests.php
Service Bus Delete Queue Implementation + Service Bus related Infrastructure improvement. The remaining issues have been tracked in github issues.
Conflicts:
	src/WindowsAzure/Services/Blob/Models/AccessCondition.php
	src/WindowsAzure/Services/Blob/Models/ContainerACL.php
	src/WindowsAzure/Services/Blob/Models/SourceAccessCondition.php
	tests/unit/WindowsAzure/Services/Blob/Models/AccessConditionTest.php
	tests/unit/WindowsAzure/Services/Blob/Models/ContainerACLTest.php
	tests/unit/WindowsAzure/Services/Blob/Models/GetContainerACLResultTest.php
Conflicts:
	src/WindowsAzure/Services/Blob/BlobRestProxy.php
	tests/WindowsAzureTests.php
Apply code review

Code Review: AliakB
Added unit test for new method arrayKeyExistsIgnoreCase
jcookems and others added 26 commits May 21, 2012 12:40
Refactor functional test base to be more robust
Bug fixes

Code Review: AliakB
Housekeeping: Fix minor code style issues.
Replacing the author headers to be the team contact information for
consistency.
Replacing author header entries
Fix @author tag

Code Review: AndreRod, GongChen
Conflicts:
	WindowsAzure/Common/Internal/Resources.php
	WindowsAzure/Common/Internal/Serialization/XmlSerializer.php
	WindowsAzure/ServiceBus/Models/ActiveToken.php
	WindowsAzure/ServiceBus/ServiceBusRestProxy.php
	src/WindowsAzure.php
	tests/WindowsAzureTests.php
	tests/framework/ServiceBusRestProxyTestBase.php
	tests/unit/WindowsAzure/ServiceBus/ServiceBusRestProxyTest.php
gcheng pushed a commit that referenced this pull request May 24, 2012
@gcheng gcheng merged commit 909b8b8 into gcheng:servicebus May 24, 2012
@gcheng
Copy link
Owner

gcheng commented May 24, 2012

LGTM

ogail pushed a commit that referenced this pull request Jul 24, 2012
Add configuration for service bus using connection strings
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.

5 participants