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

EncryptionKeyJsonProperty Merge Conflicts #1

Merged

Conversation

aayush3011
Copy link
Owner

No description provided.

azure-sdk and others added 30 commits September 14, 2021 11:48
* Increment package version after release of com.azure azure-security-keyvault-keys

* Increment package version after release of com.azure azure-security-keyvault-administration
Increment package version after release of com.azure azure-security-keyvault-certificates
Increment package version after release of com.azure azure-security-keyvault-secrets

Co-authored-by: Victor Colin Amador <[email protected]>
Dump Heap on OOM and Retain Heap Dump and Change How maven-surefire-plugin argLine is configured
* Updated poms and some javadocs

* Updated changelogs and readmes

* Updated changelog headings
Update Storage POMs to Use New Surefire Argline Pattern
* update version

* regen

* changelog

* remove UserAssignedIdentitiesValue from policy, as Identity is overriden by one in resources
* update version_client.txt

* update pom.xml

* update README.md

* update CHANGELOG.md
Make Context.NONE a Specialized Subclass
* Skip PSModule caching in container jobs

* Add succeeded check to condition

Co-authored-by: Wes Haggard <[email protected]>

Co-authored-by: Ben Broderick Phillips <[email protected]>
Co-authored-by: Ben Broderick Phillips <[email protected]>
Co-authored-by: Wes Haggard <[email protected]>
…termination of link with no error (#24141)

* Addressing the issue of not terminating unconfirmed-sends due to the termination of link with no error, not terminating such unconfirmed-sends was causing the Receiver to hang.

* Using this. qualifier consisent with rest of the code base
* Make ServiceName optional for verify-changelog

In cases like go where we don't pass a service name having this default to "not-specified" breaks things so we should allow for ServiceName and/or ServiceDirectory to be empty.

* Put quotes around the strings to allow for empty

Co-authored-by: Wes Haggard <[email protected]>
NPE occurs when requesting osUnmanagedDiskVhdUri() but no VHD is present in the VirtualMachine.
* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-containerregistry

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-containerinstance

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-containerservice

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-trafficmanager

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-authorization

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-appplatform

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-privatedns

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-appservice

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-resources

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-servicebus

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-keyvault

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-eventhubs

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-monitor

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-storage

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-network

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-compute

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-cosmos

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-search

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-redis

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-sql

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-msi

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-dns

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager-cdn

* Increment package version after release of com.azure.resourcemanager azure-resourcemanager
Take latest dependencies and prepare release which includes small logging change (MS-CV no longer redacted from log by default).
* Release eventgrid

* generate without flattening models
Increment package version after release of com.azure.resourcemanager azure-resourcemanager-eventgrid
* Updated platform-matrix.json and tests.yml to ensure Code Coverage for Key Vault Administration is only checked when running against an HSM endpoint.

* Applied PR feedback.

* Fixed matrix importing issue with platform-matrix.json

* Fixed path to platform-matrix.json

* Fixed failing Keys tests for Managed HSM.

* Removed unused imports.
* Common pipeline template and script to detect API changes

* Cahnges as per review comments

* Review comment changes

* CCahgnes as per review comments

* Show warning for list of failed packages to detect API changes

* Apply suggestions from code review

Co-authored-by: Wes Haggard <[email protected]>

Co-authored-by: praveenkuttappan <[email protected]>
Co-authored-by: praveenkuttappan <[email protected]>
Co-authored-by: Wes Haggard <[email protected]>
* API consistency review updates

* update type names

* revert experimental changes

* Fix codesnippet name
mssfang and others added 10 commits September 16, 2021 15:04
* move response error to azure-core

* remove empty package from module-info

* update monitor to use ResponseError

* update coverage threshold
Correct dependency version mismatch section
* Fix typo in eventgrid sample readme

* update sample details

* add link https://aka.ms/azsdk/java/mgmt
* Aggregate query changes

* Aggregate query changes

* Aggregate query changes

* Aggregate query changes

* Aggregate query changes

* Aggregate query changes

* Aggregate query changes

* Aggregate query changes

* Resolving comments

* Resolving comments

* Resolving comments

* Resolving comments

Co-authored-by: Aayush Kataria <[email protected]>
When preparing the 1.1.0 release the last time, I picked up a dependency on the beta version of auth, rather than the released version.
Increment package version after release of com.azure azure-mixedreality-remoterendering
@aayush3011 aayush3011 merged commit 6657a97 into aayush3011:users/akataria/updateEncryptionAlgorithmJson Sep 17, 2021
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.