Merge master to dev15.7 #4302
Closed
Merge master to dev15.7 #4302
Conversation
This file contains hidden or 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
* fix build.sh for OSX and a little cleanup * fix build for mono packaging * fix build for mono packaging * disable some tests by default on OSX with build.sh test * fix build from source IVTs
use dev15.5 for CI builds
|
@dsyme There were some conflicts with this merge around the fixes to the Mono build that you made in #4273. Can you take a look to make sure I resolved the conflicts accordingly? One thing to note is that I've since moved the |
…dev15.7-20180202-080051
brettfo
force-pushed
the
merges/master-to-dev15.7-20180202-080051
branch
from
279ff4a to
cb116f6
Compare
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 is an automatically generated pull request from master into dev15.7.
git fetch --all git checkout merges/master-to-dev15.7-20180202-080051 git reset --hard upstream/dev15.7 git merge upstream/master # Fix merge conflicts git commit git push merges/master-to-dev15.7-20180202-080051 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.