Skip to content

/ saltfs

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

Fix Vagrantfile after #374 #394

Merged
merged 3 commits into from Jul 12, 2016
Merged

Fix Vagrantfile after #374 #394

merged 3 commits into from Jul 12, 2016

Conversation

@aneeshusa
Copy link
Member

aneeshusa commented Jun 8, 2016 •
edited by larsbergstrom

This is the second time I've broken it, so also add a test.

This change is Reviewable
@aneeshusa aneeshusa force-pushed the aneeshusa:fix-Vagrantfile-after-374 branch 2 times, most recently from 6f9dcfd to 895859a Jun 8, 2016
@aneeshusa aneeshusa mentioned this pull request Jul 6, 2016
Closed
@aneeshusa aneeshusa force-pushed the aneeshusa:fix-Vagrantfile-after-374 branch from 14dc797 to 676dfec Jul 6, 2016
@aneeshusa
Copy link
Member Author

aneeshusa commented Jul 6, 2016

r? @larsbergstrom or @edunham

I haven't had a chance to figure out how to make the smoke test pass on Travis. However, we've gotten a large influx of new contributors that are trying to use the Vagrantfile and are running into the fact that it's broken, so I think it's important it gets fixed ASAP. (See here and here for examples.) I've updated this to include just the fix for now so we can make it easier for new contributors; the test can be added later.
@aneeshusa aneeshusa mentioned this pull request Jul 8, 2016
Closed
@aneeshusa
Copy link
Member Author

aneeshusa commented Jul 8, 2016

Caught another contributor at #434.
@edunham
Copy link
Contributor

edunham commented Jul 8, 2016

Reviewed 2 of 2 files at r1.
Review status: 1 of 6 files reviewed at latest revision, all discussions resolved.

Comments from Reviewable
@bors-servo
Copy link
Contributor

bors-servo commented Jul 11, 2016

☔ The latest upstream changes (presumably #420) made this pull request unmergeable. Please resolve the merge conflicts.
@edunham
Copy link
Contributor

edunham commented Jul 11, 2016

@bors-servo r+

@aneeshusa I think you're good to go on this once it's up to date.
@bors-servo
Copy link
Contributor

bors-servo commented Jul 11, 2016

📌 Commit 98c983d has been approved by edunham
@bors-servo
Copy link
Contributor

bors-servo commented Jul 11, 2016

🔒 Merge conflict
aneeshusa added 3 commits Jun 8, 2016
@aneeshusa
Fix Vagrantfile to handle multiple env variables.
6fbc0f9 
Environment variables are now passed as a list,
instead of a string.
@aneeshusa
Switch from sh to bash to match Servo style guide
f06c6b5 
Originally, I restricted these scripts to pure sh to avoid too many
compatibility issues between Linux and OS X, but I've changed my mind
and now prefer using bash to gain a few nice features.
@aneeshusa
Handle paths more portably in Vagrantfile
Loading status checks…
1a1eeb2
@aneeshusa aneeshusa force-pushed the aneeshusa:fix-Vagrantfile-after-374 branch from 98c983d to 1a1eeb2 Jul 12, 2016
@aneeshusa
Copy link
Member Author

aneeshusa commented Jul 12, 2016

@bors-servo r=edunham
Merge conflict was very small (1-2 lines).
@bors-servo
Copy link
Contributor

bors-servo commented Jul 12, 2016

📌 Commit 1a1eeb2 has been approved by edunham
@bors-servo
Copy link
Contributor

bors-servo commented Jul 12, 2016

⌛ Testing commit 1a1eeb2 with merge 6295fde...
bors-servo added a commit that referenced this pull request Jul 12, 2016
@bors-servo
Auto merge of #394 - aneeshusa:fix-Vagrantfile-after-374, r=edunham
Loading status checks…
6295fde 
Fix Vagrantfile after #374

This is the second time I've broken it, so also add a test.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/saltfs/394)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jul 12, 2016

☀️ Test successful - travis
@bors-servo bors-servo merged commit 1a1eeb2 into servo:master Jul 12, 2016
2 of 3 checks passed
2 of 3 checks passed
code-review/reviewable 5 files left (edunham)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
This was referenced Jul 12, 2016
Merged
Closed
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
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
@aneeshusa @edunham @bors-servo
You can’t perform that action at this time.