fix: Merge mainline into keyrings, reverting the keyring reverts #209
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
This reverts commit f18c383.
revert keyrings
*Description of changes:* Updating Changelog for version 1.6.2 By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. # Check any applicable: - [ ] Were any files moved? Moving files changes their URL, which breaks all hyperlinks to the files.
…ws#191) * fix: validate entire ciphertext has been processed before returning * Updating changelog
lavaleri
approved these changes
Aug 6, 2020
lavaleri
suggested changes
Aug 6, 2020
lavaleri
approved these changes
Aug 6, 2020
acioc
pushed a commit
to acioc/aws-encryption-sdk-java
that referenced
this pull request
Aug 6, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Description of changes:
This change updates the keyring branch by merging mainline into keyrings. This change ensures that the keyrings branch is properly build on top of mainline's HEAD by reverting the reverts and updating the necessary build numbers.
By reverting the revert merge, the only changes are a result of:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.