Storage/feature branch merge with master #7276
Merged
Conversation
This file contains 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
* Add maven profile to verify readme * Revert changes to readme to pass the CI pipeline * Separate profiles for Windows
This commit should only impact live tests which are currently broken. Checking this in as an emergency work around. Might become permanent if this behavior change sticks.
* Add maven profile to verify readme * Revert changes to readme to pass the CI pipeline * Separate profiles for Windows * Profile activation for verify readme * Revert test changes
* Add dev package generation to data plane. * Add test skip condition.
* Port from v4 * Corrected package misspelling in log4j.properties and removed System.exit from Main.java * Responded to code review comments
…V4 (Azure#6254) * Port from v4 * Corrected package misspelling in log4j.properties and removed System.exit from Main.java * Port from V4 * Responded to code review comments * Reverting tests.yml file back to master
* Prevent HttpLoggingPolicy from consuming request and response bodies * Updated tests to use named ClientLogger and updated tests to use a string converted to bytes * Fixing linting issues
* Remove hard-coded version and name from clients
Kv Keys update
* API updates * samples update * API changes * sample updates + checkstyle fixes * feedback updates * compile fix * feedback update + sans update + checkstyle fixes * api updates * feedback updates * feedback updates * javadoc update * checkstyle fix * compile error fix * code updates * remove package-info file * feedback + tests update * feedback updates * remove unwanted jacoco file * secret version update * version file update * pom version updates * add tests * tests update * drop codecs dependency * update base 64 usage * spotbugs fix * feedback update * code updates * build ifx * changelog + tests update * keys version updates * feedback updates
Package index is now controlled centrally in the azure-sdk repo https://github.com/Azure/azure-sdk/blob/master/_data/releases/latest/java-packages.csv
…Azure#6684) This reverts commit 5e37d79.
* Introducing Revapi into build system. Currently it is configured to not fail the build (because it is comparing the 1.0.0-preview.N releases rather than 1.0.0). Once this versioning issue is fixed, we should flip this to fail the build. * Add revapi versions to external-dependencies.txt * Ignore packages that are under implementation. * Fail build if there are API inconsistencies. * Add versionFormat string to compare. * Skip revapi in azure-core-test * Use resource file in sdk-build-tools instead of having to resolve relative path based on pom. * Revapi not needed for aggregate report.
* CosmosDB: regenerate package-2019-08-preview * CosmosDB: regenerate package-2019-08-preview
* Update com.azure:azure-security-keyvault-keys version post release * Update file versions through the update script
New AddHeadersFromContextPolicy to add multiple headers and values for those headers. Allowing override header name in RequestIdPolicy.
* Added TestMode Live, DoNotRecord annotation, and TestContextManager * Fix linting issue * Updated new constructors to take TestContextManager instead of splayed parameters * Updated unit tests based on code changes * Add missing dependency comment * Fixing linting issues
* Removed Queue Cryptography references since the module is unused * Delete Queue Cryptography POM file
* README for samples in Event Hubs * Add impressions * Add missing readme sections * Update root readme with reference to sample readme
…7166) * Fixing potential NPE when token managers are created multiple times. * Fix test assertions. * Add test for provider.
gapra-msft
force-pushed
the
storage/featureBranchMergeWithMaster
branch
from
2b32afb to
8949779
Compare
gapra-msft
force-pushed
the
storage/featureBranchMergeWithMaster
branch
from
8949779 to
8d6189b
Compare
gapra-msft
requested review from
alzimmermsft,
conniey,
danieljurek,
g2vinay,
hemanttanwar,
jaschrep-msft,
jianghaolu,
JimSuplizio,
JonathanGiles,
joshfree,
kushagraThapar,
mitchdenny,
moderakh,
mssfang,
nemakam,
rickle-msft,
samvaity,
sima-zhu,
srnagar,
weshaggard and
yvgopal
as code owners
rickle-msft
approved these changes
Jan 8, 2020
|
@gapra-msft It looks like you did a squash merge into this feature branch which is likely not what you wanted. When moving changes from other branches you generally don't want to merge with github UI but instead do it from the command line. You can us the github UI for PR validation if you like but the actually merge should be pushed from the command line because you generally need to preserve the source history instead of squashing. |
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.
No description provided.