merge current state of develop (2.4.2) into pre/2.5 #1185
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
… in mode source or monitor
|
I think instead of reviewing all the changed files it would be best for @dbochkov to just know what was changed when conflicts were resolved... You could try the merge locally to check that out I guess. And then the next test would be rebasing the heat on top of this and checking that everything works still. |
|
Merge conflicts were only in the webapi imports and version.py. But yea feel free to use this as needed or close |
…dex in mode dataframe if not computed
dbochkov-flexcompute
force-pushed
the
tyler/merge/2.4.2
branch
from
a52b30e
to
8262c43
Compare
|
updated this to the most recent pre/2.5.0 and develop. Indeed, all conflicts were trivial. I think we can merge this |
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.
fixes some very minor merge conflicts.