Resolving Merge Conflicts #1
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Set storage account test resources to disable blob public access * Skip adding network rules to storage accounts that don't need them during cleanup * Add succeeded check to set pipeline subnet info step * Disable network firewall by default in resource creation/removal --------- Co-authored-by: Ben Broderick Phillips <[email protected]>
…in id property to be created (Azure#41108) * Added optional id validation to prevent documents with invalid chars in id property to be created
…24-05-08 (Azure#41142) * [Automation] External Change * [Automation] Generate Fluent Lite from Swagger informatica#package-2024-05-08 * remove tsp-location.yaml as generated from swagger --------- Co-authored-by: XiaofeiCao <[email protected]>
* add client endpoint type to interface * add default value and fix comment * fix lint issues * add mqtt jwt parser implementation * fix lint issues * publish new test records * remove unnecessary imports * update changelog.md * update changelog.md * remove unused import * update recorded tests * fix lint issues * change connectionID to run tests * increase code coverage * add edge test cases * remove import * and update Changelog * update changelog * change method signature for better usability * fix checkstyle * add test coverage * update javadoc * refactor methods * remove unnecessary params * refactor method name * update changelog --------- Co-authored-by: chuongnguyen <[email protected]>
The casing on a field name is incorrect, preventing serialization.
* Remove duplication and clarify doc User reported being confused about where this credential can be used by our documentation. Cleaning it up some. * Update sdk/identity/azure-identity/src/main/java/com/azure/identity/InteractiveBrowserCredential.java Co-authored-by: Christopher Scott <[email protected]> * Update sdk/identity/azure-identity/src/main/java/com/azure/identity/InteractiveBrowserCredential.java Co-authored-by: Christopher Scott <[email protected]> * fix typo --------- Co-authored-by: Christopher Scott <[email protected]>
* Change detection of PEM/FPX certificates Previously we depended on a password being specified to know if we had a PFX or a PEM. Now we just look at the bytes to know if it starts with the proper header. Fixes Azure#37210 * update changelog
* Remove rarely used/unused test util methods. * Move getConnectionString to TestUtils. * Remove unneeded getTestMode check. * Move getConnectionString properties. * Add final to remove warning * Make toClose more generalised with AutoCloseable.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolving Merge Conflicts