Skip to content

Master merge#11793

Merged
kasobol-msft merged 152 commits intoAzure:feature/storage/stg73from
rickle-msft:masterMerge
Jun 5, 2020
Merged

Master merge#11793
kasobol-msft merged 152 commits intoAzure:feature/storage/stg73from
rickle-msft:masterMerge

Conversation

@rickle-msft
Copy link
Contributor

@rickle-msft rickle-msft commented Jun 4, 2020

Merging master into stg73 to pull in some bug fixes and resolve conflicts.

samvaity and others added 30 commits May 18, 2020 11:06
* set global SubscriptionConfiguration

* add default value to $(SubscriptionConfiguration)

* set $(SubscriptionConfiguration) at the template job's level
* Pull swagger new changes

* Make readme changes
* Update relativePath to azure-data-sdk-parent pom

* Move the plugin configuration into pluginManagement from reporting
* Adding more flexible support for encodings.
* Misc fixes for cosmos public surface APIs

* Added constant for warning annotation message
* update compute version and regenerate code

* manual fix to clear compile error

* update session records

* fix spotbugs error

* manual fix for map serialization

* update compute sample session records
* Update synchronous receive sample.

* Remove ReceiveAsyncOptions and fix build breaks.

* Update peek -> browse

* Add support for maximum lock renewal time.

* Fix completion with sessionId.

* Adding integration tag.

* Fix documentation. Add overload for String.
* IncludedPath/ExcludedPath update

* revert some change

* resolve comments

* fix

* resolve comments

Co-authored-by: Annie Liang <xinlian@microsoft.com>
* UpdateConflictResolutionPolicyDocsUpdate

Co-authored-by: Annie Liang <xinlian@microsoft.com>
* Deleted pacakge private Transform but move all context from it to Utility in the impl package

* remove Transform checkstyle suppression
* Moved ConsistencyPolicy to implementation

* Fixed public constructor of ConsistencyPolicy. Added package-private constructors for ConflictResolutionPolicy for Json serializable ModelBridgeInternal APIs

* Re-extending JsonSerializable since ConsistencyPolicy is internal now
* move PollerFactory to polling package; remove AzureHost

* rename azure-management-core

* fix checkstyle

* Revert "rename azure-management-core"

This reverts commit b07ffb3.

* revert fluent sdk change
* movingFeedDiagnosticToCosmosDiagnostic

* moving feeddiagnostics to implementation
* removingAccessConditionClassType

* doc correction

* Etag -> ETag
* CosmosClientException Update

Co-authored-by: Annie Liang <xinlian@microsoft.com>
* Change from CosmosKeyCredential to AzureKeyCredential

* change keyCredential to credential

Co-authored-by: Annie Liang <xinlian@microsoft.com>
…11108)

Currently we don't support connection via proxy for ManagementClient, but we have proxy support for QueueClient, SubscriptionClient, MessageSender, MessageReceiver via AMQP. This change will address the feature gap.
Azure#10311
* share artifact staging. add release stage

Co-authored-by: James Suplizio <jasupliz@microsoft.com>
@kasobol-msft
Copy link
Contributor

Is it somehow possible to extract just diff for sdk/storage ?

@kasobol-msft
Copy link
Contributor

/azp run java - storage -ci

@azure-pipelines
Copy link

No pipelines are associated with this pull request.

@kasobol-msft kasobol-msft merged commit ffb08e6 into Azure:feature/storage/stg73 Jun 5, 2020
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.