Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Merge dev into master #451

Merged
merged 701 commits into from Jun 6, 2012

Conversation

Projects
None yet
3 participants
Contributor

ogail commented Jun 6, 2012

No description provided.

ogail and others added some commits May 2, 2012

@ogail ogail Merge pull request #272 from ogail/basicAGAPIs
Change StorageAccount to StorageService

Code Review: AliakB, JCooke
8003891
Abdelrahman Elogeel Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-php
… into basicAGAPIs
40e9fde
Albert Cheng Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-php
… into servicebus

Conflicts:
	src/WindowsAzure/Core/RestProxy.php
	src/WindowsAzure/Core/Serialization/XmlSerializer.php
	src/WindowsAzure/Core/ServicesBuilder.php
	src/WindowsAzure/Resources.php
	src/WindowsAzure/Services/Blob/Models/ContainerACL.php
	src/WindowsAzure/Services/Core/ServiceRestProxy.php
	src/WindowsAzure/Services/Table/TableRestProxy.php
	src/autoload.php
	tests/functional/WindowsAzure/Services/Queue/QueueServiceFunctionalParameterTest.php
	tests/unit/WindowsAzure/Core/Serialization/XmlSerializerTest.php
	tests/unit/WindowsAzure/Core/ServiceRestProxyTest.php
	tests/unit/WindowsAzure/Services/Queue/Models/QueueMessageTest.php
	tests/unit/WindowsAzure/Services/Table/TableRestProxyTest.php
	tests/unit/WindowsAzure/UtilitiesTest.php
8046201
@ogail ogail Merge pull request #275 from ogail/basicAGAPIs
Merge with dev branch
02a1b29
@ogail ogail Merge pull request #276 from WindowsAzure/ServiceManagement
Merge Service Management into dev branch

Code Review: AntonBa, JCooke
a12f8e8
Andre Rodrigues #277: Roleenvironment::setstatus throws channelnotfound exception. 3f58ea8
André Rodrigues Merge pull request #279 from andrerod/dev
#277: Roleenvironment::setstatus throws channelnotfound exception.
46c7da0
Abdelrahman Elogeel Add Tasklist sample. 170610a
Abdelrahman Elogeel Add copyright header. 01f424d
Abdelrahman Elogeel Adding copyright headers. 11ed547
Abdelrahman Elogeel Update README.markdown 51ff124
Abdelrahman Elogeel Add examples README.markdown 7f631d4
Abdelrahman Elogeel Update README.markdown cdfa3b9
Albert Cheng Service Bus Infrastructure. bb31ced
Albert Cheng Service Bus infrastructure 2. 9c699a5
Abdelrahman Elogeel Apply review feedback. 154f436
Albert Cheng fix the line ending issue caused by GIT on Windows. 9455036
Albert Cheng Code cleanning for CR. 49717ef
Abdelrahman Elogeel Add copyright header 35b9133
Albert Cheng Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-php
… into servicebus

Conflicts:
	tests/autoload.php
751d99e
Abdelrahman Elogeel Apply code review c0fa913
@jcookems jcookems Changing InvalidArgumentException to \InvalidArgumentException
Fixed math slang
1164f22
@jcookems jcookems Merge pull request #267 from jcookems/cleanupTableTests
Cleanup table tests
90bacfb
Albert Cheng code review comments for service bus infrastructure. 5d472b5
Albert Cheng Merge pull request #283 from gcheng/servicebus
Servicebus basic infrastructure
a8cfb6a
Abdelrahman Elogeel Apply code review 5122021
Abdelrahman Elogeel Apply code review 884e9bf
@ogail ogail Merge pull request #280 from ogail/master
Add tasklist sample

Code Review: AndreRod, JCooke, AntonBa
44ba42b
Abdelrahman Elogeel Bunch of changes
1) Move SM to Service/SM
2) Change autoload.php to WindowsAzure.php
3) Remove require_once on XML_Serializer lib.

Signed-off-by: Abdelrahman Elogeel <Abdelrahman.Elogeel@microsoft.com>
57ce81f
Abdelrahman Elogeel Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-php
Conflicts:
	src/WindowsAzure.php
	tests/WindowsAzureTests.php
d25f785
@jcookems jcookems Sample showing how to change dates for Blob ccfd229
Abdelrahman Elogeel Merge with main repo fad0631
Abdelrahman Elogeel Remove WindowsAzure.php 1c97772
Abdelrahman Elogeel Merge with main repo 36dd078
Abdelrahman Elogeel Rename autoload.php to WindowsAzure.php d27a12d
Abdelrahman Elogeel Remove unnecessary requires for XML_Serializer 52a2460
Abdelrahman Elogeel Move SM to Services/SM 0df2905
Andre Rodrigues #242: 'String could not be parsed as XML' thrown when there is a chan…
…ged event
084b776
Andre Rodrigues Adding UT to trackChanges method. 0588c9b
@jcookems jcookems Adding functional integration tests for blob. 716d9db
Albert Cheng Service Bus infrastructure + DeleteQueue implementation. d35c57a
Andre Rodrigues Applying code review comments. b7733ea
André Rodrigues Merge pull request #305 from andrerod/dev
#242: 'String could not be parsed as XML' thrown when there is a changed...
70a7c78
Abdelrahman Elogeel Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-php f055840
@ogail ogail Merge pull request #301 from ogail/master
Bunch of changes

Code Review: AndreRod, JCooke
5550ac5
Abdelrahman Elogeel Fix #281 7f0d328
Andre Rodrigues Fixing wrong comparison. cbd229a
@jcookems jcookems Address review feedback a074594
@jcookems jcookems Adding functional integration tests for blob.
Addressed review feedback
4250417
@jcookems jcookems Merge branch 'blobFunctional' of github.com:jcookems/azure-sdk-for-ph…
…p into blobFunctional

Conflicts:
	tests/WindowsAzureTests.php
7d573f9
@jcookems jcookems Adding missing return statement in function 5d761fe
@jcookems jcookems Removing outdated code comment 2d6be76
Albert Cheng Address code review feedbacks. da24d6f
Albert Cheng Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-php
… into servicebus

Conflicts:
	src/WindowsAzure.php
	tests/WindowsAzureTests.php
9bbd71d
Albert Cheng Revert a minor test change. 8e558da
Albert Cheng Fix line ending issue. b5f558f
@jcookems jcookems Making test more robust eba97bc
@jcookems jcookems Merge branch 'blobDate' of github.com:jcookems/azure-sdk-for-php into…
… blobDate
8e84fb4
André Rodrigues Merge pull request #316 from andrerod/dev
Fixing wrong comparison.
e3d89fa
Abdelrahman Elogeel add WindowsAzure.php to checkstyle ignore 9477d91

jcookems and others added some commits Jun 1, 2012

@jcookems jcookems Fix unit tests that started failing when I added a namespace. bc3a19d
Albert Cheng Merge pull request #436 from jcookems/fixtests
Fixtests
acefd0c
@jcookems jcookems Using E_STRICT found two functions that should be static:
* All the Utilities functions should be static
* The Async factory should be static
0d258d6
Albert Cheng Merge pull request #437 from jcookems/fixESTRICTerrors
Fix e-strict errors
c36b01d
@jcookems jcookems Fix static access warning b4230f0
Abdelrahman Elogeel Fix #421 Fix #424 f43f767
@ogail ogail Merge pull request #440 from jcookems/dev
Dev

Code Review: AOgail
1d8a0c9
Abdelrahman Elogeel Apply code review 7d364d7
Abdelrahman Elogeel Fix #421 d5d04bb
Abdelrahman Elogeel Fix #378 0015067
Abdelrahman Elogeel Fix #422 1dd36e6
Abdelrahman Elogeel Update package.xml 8e01f7d
Abdelrahman Elogeel Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-php
Conflicts:
	tests/framework/FiddlerFilter.php
	tests/framework/TestResources.php
	tests/functional/WindowsAzure/Blob/BlobServiceFunctionalTest.php
	tests/functional/WindowsAzure/Blob/BlobServiceFunctionalTestData.php
	tests/functional/WindowsAzure/Blob/BlobServiceIntegrationTest.php
	tests/functional/WindowsAzure/Blob/FunctionalTestBase.php
	tests/functional/WindowsAzure/Blob/IntegrationTestBase.php
	tests/functional/WindowsAzure/Queue/FunctionalTestBase.php
	tests/functional/WindowsAzure/Queue/IntegrationTestBase.php
	tests/functional/WindowsAzure/Queue/QueueServiceFunctionalOptionsTest.php
	tests/functional/WindowsAzure/Queue/QueueServiceFunctionalParameterTest.php
	tests/functional/WindowsAzure/Queue/QueueServiceFunctionalTest.php
	tests/functional/WindowsAzure/Queue/QueueServiceFunctionalTestData.php
	tests/functional/WindowsAzure/Queue/QueueServiceIntegrationTest.php
	tests/functional/WindowsAzure/Table/FunctionalTestBase.php
	tests/functional/WindowsAzure/Table/IntegrationTestBase.php
	tests/functional/WindowsAzure/Table/TableServiceFunctionalOptionsTest.php
	tests/functional/WindowsAzure/Table/TableServiceFunctionalParametersTest.php
	tests/functional/WindowsAzure/Table/TableServiceFunctionalQueryTest.php
	tests/functional/WindowsAzure/Table/TableServiceFunctionalTest.php
	tests/functional/WindowsAzure/Table/TableServiceFunctionalTestData.php
	tests/functional/WindowsAzure/Table/TableServiceFunctionalTestUtils.php
	tests/functional/WindowsAzure/Table/TableServiceIntegrationTest.php
	tests/mock/WindowsAzure/Common/Internal/Authentication/SharedKeyAuthSchemeMock.php
	tests/mock/WindowsAzure/Common/Internal/Authentication/StorageAuthSchemeMock.php
	tests/mock/WindowsAzure/Common/Internal/Authentication/TableSharedKeyLiteAuthSchemeMock.php
	tests/unit/WindowsAzure/Common/ConfigurationTest.php
	tests/unit/WindowsAzure/Common/Internal/Authentication/SharedKeyAuthSchemeTest.php
	tests/unit/WindowsAzure/Common/Internal/Authentication/StorageAuthSchemeTest.php
	tests/unit/WindowsAzure/Common/Internal/Authentication/TableSharedKeyLiteAuthSchemeTest.php
	tests/unit/WindowsAzure/Queue/QueueRestProxyTest.php
857b27d
Abdelrahman Elogeel Run full build d472d63
Abdelrahman Elogeel Revert to d5d04bb 99f4f12
Abdelrahman Elogeel Merge branch 'master' of https://github.com/ogail/azure-sdk-for-php 7d5de78
Abdelrahman Elogeel Revert "Fix #421"
This reverts commit d5d04bb.
99d5d11
Abdelrahman Elogeel Revert to stable commit 4cb5359
Abdelrahman Elogeel Fix revert changes afaa5ed
Abdelrahman Elogeel Fix header comments 5bc87d3
Abdelrahman Elogeel Fix #378 1212d00
Abdelrahman Elogeel Fix #422 9626965
Abdelrahman Elogeel Fix build.xml fc58833
Abdelrahman Elogeel Update package.xml f09ce43
Abdelrahman Elogeel Revert "Fix #422"
This reverts commit 9626965.
404b4fb
Abdelrahman Elogeel Updatre package.xml 8cdcc36
@ogail ogail Merge pull request #442 from ogail/master
Fix #421

Code Review: AndreRod
4ef7192
Abdelrahman Elogeel Change Blob code @link 5673116
Abdelrahman Elogeel Change @line for all storage services 18157d2
Abdelrahman Elogeel Fix #367 66623ce
@ogail ogail Merge pull request #443 from ogail/master
Rest of fix
3d5322d
@jcookems jcookems Add missing semicolon to license. a330247
@jcookems jcookems Fix spacing in header 3ea7942
@jcookems jcookems Add blank line before start of license. a7b3027
@jcookems jcookems Add license to autoload files and their generators. ddd5072
@jcookems jcookems Update namespaces to match the @package name 0927051
@jcookems jcookems Update @link for autoload files. b72dd08
Abdelrahman Elogeel Fix part of Common ca1647d
@jcookems jcookems Update @link for new license sections. 8cac88a
@jcookems jcookems Updating namespaces in test autoload 978f2ac
Albert Cheng Merge pull request #444 from jcookems/headerFixes
Header fixes
a2f5e96
Abdelrahman Elogeel Change @link for some of Common c7c630f
Abdelrahman Elogeel Change @link for Common 17ddb56
Abdelrahman Elogeel Change Filters @link a290fab
Abdelrahman Elogeel Change @link to correct one 48f4317
Abdelrahman Elogeel Change @link for TableSharedKeyLiteAuthScheme.php 3e9dd60
Abdelrahman Elogeel Change @link 43107fe
Abdelrahman Elogeel Add new-pear-release task 7120108
Abdelrahman Elogeel Add LICENSE.txt and push to PEAR c09665d
Abdelrahman Elogeel Ignore generated package files 5564d1a
Abdelrahman Elogeel Merge branch 'dev' of https://github.com/WindowsAzure/azure-sdk-for-php
Conflicts:
	tests/WindowsAzureTests.php
015f0fd
Abdelrahman Elogeel Fix WindowsAzureTests.php d20f840
Abdelrahman Elogeel Merge pull request #445 from ogail/master
Cleanup

Code Review: AliakB
005b1e9
Anton Babadjanov readme update 67d8a84
Anton Babadjanov readme update 2 0c6cf58
Abdelrahman Elogeel Merge pull request #449 from antonba/dev
readme with examples for storage

Code Review: GongChen, JCooke, AOgail
01d946b
Abdelrahman Elogeel Update package.xml ab730e9
Abdelrahman Elogeel Merge pull request #450 from ogail/master
Update package.xml
b9a7eed

@ogail ogail pushed a commit that referenced this pull request Jun 6, 2012

Abdelrahman Elogeel Merge pull request #451 from WindowsAzure/dev
Merge dev into master
ab846dc

@ogail ogail merged commit ab846dc into master Jun 6, 2012

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment