Cdkharris/big merge #32
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…or/revert-407-amdahl-code Revert "Amdahl code"
…Corrections Removes typo
There is an implication that `ls` can be used to read the file. This disambiguates that implication.
Upon reviewing everyone's current job-with-name-status.snip, I realized that they all had "new_name" instead of "hello-world". If "hello-world" is preferred, that would mean updating everyone's snip instead of the one line here.
…Corrections Removes unneeded comma, redundant word, and changes to active voice
I had to move the structure of the paragraph around. Only the first two lines had important changes.
This reverts commit a38da5b.
…Corrections Episode13 corrections
…Corrections Episode17 corrections
8 tasks
Rsync's behavior when uploading a directory
Filezilla remote tunneling instructions
This reverts commit 24210cd.
…or/ocaisa-patch-1 Add `-L` option to `curl` command
…CL-update-site-snippets Update UCL site snippets
|
Howdy @dpshelio , with your approval I'm ready to merge this into gh-pages. Remaining differences between this branch and gh-pages-upstream: Configuration Divergent customisations for UCL/Myriad and/or SGE These are small, manageable differences. It is expected that the other sites (e.g. Birmingham) will fail to build in our repo due to some custom snippets. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merge brings in several updates from the upstream repository for the lesson, including new sites and new lessons, one on environment variables and an overhaul of the parallel python lesson.
The lessons still need to be tested on Myriad and our site snippets need to be updated.