Skip to content

Ignore file locks on OSX NFS mounts#2720

Merged
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:ignore-nfs-more-often
Jun 12, 2016
Merged

Ignore file locks on OSX NFS mounts#2720
bors merged 1 commit into
rust-lang:masterfrom
alexcrichton:ignore-nfs-more-often

Conversation

@alexcrichton

Copy link
Copy Markdown
Member

We already ignore NFS on Linux so let's do the same on OSX as well.

@rust-highfive

Copy link
Copy Markdown

r? @wycats

(rust_highfive has picked a reviewer for you, use r? to override)

@brson

brson commented Jun 11, 2016

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jun 11, 2016

Copy link
Copy Markdown
Contributor

📌 Commit db595e9 has been approved by brson

@bors

bors commented Jun 11, 2016

Copy link
Copy Markdown
Contributor

⌛ Testing commit db595e9 with merge 5345f1c...

@bors

bors commented Jun 11, 2016

Copy link
Copy Markdown
Contributor

💔 Test failed - cargo-mac-64

@alexcrichton alexcrichton force-pushed the ignore-nfs-more-often branch from db595e9 to fe77f00 Compare June 12, 2016 10:39
@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r=brson

@bors

bors commented Jun 12, 2016

Copy link
Copy Markdown
Contributor

📌 Commit fe77f00 has been approved by brson

@bors

bors commented Jun 12, 2016

Copy link
Copy Markdown
Contributor

⌛ Testing commit fe77f00 with merge f91e6fe...

@bors

bors commented Jun 12, 2016

Copy link
Copy Markdown
Contributor

💔 Test failed - cargo-mac-32

@alexcrichton alexcrichton force-pushed the ignore-nfs-more-often branch from fe77f00 to 89f77f4 Compare June 12, 2016 10:46
@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r=brson

@bors

bors commented Jun 12, 2016

Copy link
Copy Markdown
Contributor

📌 Commit 89f77f4 has been approved by brson

@bors

bors commented Jun 12, 2016

Copy link
Copy Markdown
Contributor

⌛ Testing commit 89f77f4 with merge 57c71e5...

@bors

bors commented Jun 12, 2016

Copy link
Copy Markdown
Contributor

💔 Test failed - cargo-mac-64

Comment thread src/cargo/util/flock.rs Outdated

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Ok(()) // no ?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Oops!

We already ignore NFS on Linux so let's do the same on OSX as well.
@alexcrichton alexcrichton force-pushed the ignore-nfs-more-often branch from 89f77f4 to c8abb20 Compare June 12, 2016 15:18
@alexcrichton

Copy link
Copy Markdown
Member Author

@bors: r=brson

@bors

bors commented Jun 12, 2016

Copy link
Copy Markdown
Contributor

📌 Commit c8abb20 has been approved by brson

bors added a commit that referenced this pull request Jun 12, 2016
Ignore file locks on OSX NFS mounts

We already ignore NFS on Linux so let's do the same on OSX as well.
@bors

bors commented Jun 12, 2016

Copy link
Copy Markdown
Contributor

⌛ Testing commit c8abb20 with merge 941f488...

@bors

bors commented Jun 12, 2016

Copy link
Copy Markdown
Contributor

@bors bors merged commit c8abb20 into rust-lang:master Jun 12, 2016
@alexcrichton alexcrichton deleted the ignore-nfs-more-often branch June 16, 2016 09:04
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.

6 participants