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.

Sign up for GitHub

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

Jump to bottom

[0.12.0] Import okay #4152

Merged
merged 2 commits into from
Feb 18, 2019
Merged

[0.12.0] Import okay #4152

merged 2 commits into from
Feb 18, 2019

Conversation

emkll
Copy link
Contributor

@emkll emkll commented Feb 18, 2019

Status

Ready for review

Description of Changes

Ports #4151 to the 0.12.0 release branch

Testing

Changes are identical to those introduces in #4151

redshiftzero and others added 2 commits February 18, 2019 10:32
@redshiftzero @emkll
securedrop-app-code postinst: migrate keyring
720cc28 
(cherry picked from commit 261468a)
@kushaldas @emkll
Fixes #4108 no import_ok error for importing gpg
af11157 
--batch flag helps to import the gpg keys into gpg2 format
without having the passphrase.

(cherry picked from commit 71ac0eb)
kushaldas
kushaldas approved these changes Feb 18, 2019
View reviewed changes
Copy link
Contributor

@kushaldas kushaldas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commits are good and same patches from the original set in develop. Approving.

@emkll emkll merged commit c0582a7 into release/0.12.0 Feb 18, 2019
@emkll emkll deleted the 4151-to-0.12.0 branch February 18, 2019 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kushaldas kushaldas kushaldas approved these changes

@conorsch conorsch Awaiting requested review from conorsch

@msheiny msheiny Awaiting requested review from msheiny

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@emkll @kushaldas @redshiftzero