Merge dev15.4.x to master #21984
Merged
Merge dev15.4.x to master #21984
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
Added retry on OOP start up
…0170831-070008 Merge dev15.3.x to dev15.4.x
heejaechang
force-pushed
the
merges/dev15.4.x-to-master-20170908-070011
branch
from
ec67e4c to
b5e3709
Compare
|
i fixed merge conflicts but some tests were failing due to something unrelated issues? |
|
retest ubuntu_14_debug_prtest please |
|
retest perf_correctness_prtest please |
|
@natidea resolved the conflicts |
|
Thanks Heejae |
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 dev15.4.x into master.
git fetch --all git checkout merges/dev15.4.x-to-master-20170908-070011 git reset --hard upstream/master git merge upstream/dev15.4.x # Fix merge conflicts git commit git push merges/dev15.4.x-to-master-20170908-070011 --forceOnce all conflicts are resolved and all the tests pass, you are free to merge the pull request.