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

[BETA] Rollup of 2 pull requests #64983

Merged
merged 7 commits into from
Oct 2, 2019
Merged

[BETA] Rollup of 2 pull requests #64983

merged 7 commits into from
Oct 2, 2019

Conversation

tmandry
Copy link
Member

@tmandry tmandry commented Oct 2, 2019

Successful merges:

Failed merges:

r? @ghost

alexcrichton and others added 7 commits October 1, 2019 06:08
@alexcrichton
[BETA] Update cargo
0e22a3f 
1 commits in 4b105b6abfb12d6985ffe66670e8b2a85982291a..1c6ec66d5bae40e9dfd2fb82f091b5172c212d73
2019-09-25 17:26:54 +0000 to 2019-09-30 21:43:14 +0000
- [beta] Go back to not hashing `RUSTFLAGS` in `-Cmetadata` (rust-lang/cargo#7459)
@bpangWR @tmandry
update rtpSpawn's parameters type(It's prototype has been updated in …
0f89371 
…libc)
@JMS55 @tmandry
Fix div_duration() marked as stable by mistake
3449c45
@tmandry
Use https for curl when building for linux
4ba72ad
@bpangWR @tmandry
remove rtp.rs, and move rtpSpawn and RTP_ID_ERROR to libc
f36b555
@tmandry
Rollup merge of rust-lang#64956 - alexcrichton:update-beta-cargo, r=e…
845f486 
…huss

[BETA] Update cargo

1 commits in 4b105b6abfb12d6985ffe66670e8b2a85982291a..1c6ec66d5bae40e9dfd2fb82f091b5172c212d73
2019-09-25 17:26:54 +0000 to 2019-09-30 21:43:14 +0000
- [beta] Go back to not hashing `RUSTFLAGS` in `-Cmetadata` (rust-lang/cargo#7459)
@tmandry
Rollup merge of rust-lang#64982 - tmandry:beta-backport, r=tmandry
6d9465a 
[BETA] Backport changes

- update rtpSpawn's parameters type(It's prototype has been updated in libc) rust-lang#64818
- Fix div_duration() marked as stable by mistake rust-lang#64815
- Use https for curl when building for linux rust-lang#64786
- remove rtp.rs, and move rtpSpawn and RTP_ID_ERROR to libc rust-lang#64720

r? @ghost
@tmandry tmandry changed the title Rollup of 2 pull requests [BETA] Rollup of 2 pull requests Oct 2, 2019
@tmandry
Copy link
Member Author

tmandry commented Oct 2, 2019

@bors r+ p=1 rollup=never

@bors
Copy link
Contributor

bors commented Oct 2, 2019

📌 Commit 6d9465a has been approved by tmandry

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 2, 2019
@bors
Copy link
Contributor

bors commented Oct 2, 2019

⌛ Testing commit 6d9465a with merge fa5c2f3...

bors added a commit that referenced this pull request Oct 2, 2019
@bors
Auto merge of #64983 - tmandry:rollup-28hyqet, r=tmandry
fa5c2f3 
[BETA] Rollup of 2 pull requests

Successful merges:

 - #64956 ([BETA] Update cargo)
 - #64982 ([BETA] Backport changes)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Oct 2, 2019

☀️ Test successful - checks-azure
Approved by: tmandry
Pushing fa5c2f3 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 2, 2019
@bors bors merged commit 6d9465a into rust-lang:beta Oct 2, 2019
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@tmandry @bors @Centril @alexcrichton @bpangWR @JMS55