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

Backport changelog #4210

Merged
merged 5 commits into from
Mar 1, 2019
Merged

Backport changelog #4210

merged 5 commits into from
Mar 1, 2019

Conversation

heartsucker
Copy link
Contributor

Status

Ready for review

Description of Changes

Toward #4124

Backport the changelog, bump the version number.

@@ -1,6 +1,74 @@
# Changelog

Copy link
Contributor

Choose a reason for hiding this comment

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

nit: there's missing 0.13.0~rc1 at the top of the changelog

@heartsucker heartsucker mentioned this pull request Feb 27, 2019
17 tasks
Copy link
Contributor

@emkll emkll left a comment

Choose a reason for hiding this comment

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

it seems like not all changes from 9120b37 have been backported:
The following line was removed from the changelog in the commit above because it was introduced in 0.11.0:
* Prevent apt from following redirects on first install (#4058) on L35 of the changelog

@heartsucker
Copy link
Contributor Author

heartsucker commented Feb 27, 2019

@emkll I squashed that, so we should be good to go now.

emkll
emkll previously approved these changes Feb 27, 2019
@emkll
Copy link
Contributor

emkll commented Feb 27, 2019

LGTM, thanks @heartsucker

@heartsucker
Copy link
Contributor Author

I'm consistently getting this failure. Any idea what the root cause is? I don't have access to those machines.

    TASK [common : Perform safe upgrade to ensure all the packages are updated.] ***
make: *** [ci-go-xenial] Terminated
Warning: Permanently added '35.230.14.89' (ECDSA) to the list of known hosts.

scp: /home/sdci/securedrop-source/junit/*xml: No such file or directory
Too long with no output (exceeded 10m0s)

heartsucker and others added 5 commits February 28, 2019 21:31
(cherry picked from commit a4f68d2)
(cherry picked from commit 5db63ac)
(cherry picked from commit 87838db)
(cherry picked from commit 1d92816)
Copy link
Contributor

@emkll emkll left a comment

Choose a reason for hiding this comment

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

👍

@emkll emkll merged commit 8a53454 into develop Mar 1, 2019
@emkll emkll deleted the backport-changelog branch March 1, 2019 14:09
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.

3 participants