Skip to content

[stable] warn about TLS for github specifically#5086

Merged
bors merged 1 commit intorust-lang:rust-1.24.0from
matklad:rust-1.24.0-tls
Feb 26, 2018
Merged

[stable] warn about TLS for github specifically#5086
bors merged 1 commit intorust-lang:rust-1.24.0from
matklad:rust-1.24.0-tls

Conversation

@matklad
Copy link
Contributor

@matklad matklad commented Feb 26, 2018

Backport of #5069 to stable for 1.24.1 🔥 ⚠️

r? @alexcrichton

@rust-highfive
Copy link

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.24.0. Please double check that you specified the right target!

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Feb 26, 2018

📌 Commit 2dfa4ce has been approved by alexcrichton

@matklad
Copy link
Contributor Author

matklad commented Feb 26, 2018

For posterity: I've realized that I haven't done the backport in the most obvious manner: the original PR had two commits; for backport, I've cherry-picked only the last one (b/c I've forgotten that there were two commits), and had to fix (mysterious to me) merge conflicts, which amounted to basically applying the first commit as well.

So, the backport commit is basically the original two commits squashed.

@bors
Copy link
Contributor

bors commented Feb 26, 2018

⌛ Testing commit 2dfa4ce with merge 96d8071...

bors added a commit that referenced this pull request Feb 26, 2018
[stable] warn about TLS for github specifically

Backport of #5069 to stable for 1.24.1 🔥 ⚠️

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Feb 26, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 96d8071 to rust-1.24.0...

@bors bors merged commit 2dfa4ce into rust-lang:rust-1.24.0 Feb 26, 2018
@matklad matklad deleted the rust-1.24.0-tls branch March 17, 2018 08:39
@ehuss ehuss added this to the 1.24.0 milestone Feb 6, 2022
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.

5 participants