EVPath upstream for release branch #4429
Merged
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
Closed
Collaborator
|
@eisenhauer lets backport the new Frank CI to the release branch first. Lets hold this for a couple of days |
Collaborator
|
Depends on #4434 |
Collaborator
|
Please rebase this |
Member
Author
|
Unfortunately, I've found that PRs that include upstream stuff (created with our update.sh script) don't survive rebasing. (All the commits under thirdparty/X get applied to the ADIOS root, not to where they belong.). If it can't be merged as is, then I'll close and resubmit. |
Collaborator
|
Yes, what I do is to |
Member
Author
|
Well, that sequence seems to have left me with a mess, so trying the update button on github. |
Collaborator
|
Yeah I have noticed that you might have to delete dangling worktree using git worktree prune and then manually removing it... |
vicentebolea
force-pushed
the
EVup_release
branch
from
27a99f6 to
d830985
Compare
Collaborator
|
I went ahead and pushed your branch with the newly rebased commits.
…On Tue, Jan 7, 2025 at 4:30 PM Greg Eisenhauer ***@***.***> wrote:
Well, that sequence seems to have left me with a mess, so trying the
update button on github.
—
Reply to this email directly, view it on GitHub
<#4429 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAHFOFT6FYCFY5YFK3IDQ532JRBO5AVCNFSM6AAAAABTFJ2IYOVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDKNZWGI2TMMJWG4>
.
You are receiving this because your review was requested.Message ID:
***@***.***>
--
[image: logo shows large letter K with the word Kitware below it]
<http://www.kitware.com>
Vicente Bolea, MSc.
*Senior R&D Engineer*
|
Code extracted from:
https://github.com/GTkorvo/EVPath.git
at commit 5663b5a6a84dd35bc65a9ce1789697b0f7b95b41 (master).
Upstream Shortlog
-----------------
Greg Eisenhauer (21):
96ee8ed4 Changes to support windows static builds
330d16ee kill warnings
436c066f kill warnings
2be8c201 kill warnings
e2891021 kill warnings
5fe51032 remove spurious printf
fbfc7b54 Make NO_RDMA more robust
046d3d6b Fixes for FreeBSD
5c2a258a Mostly working on Windows
2b0e5669 macros for non-windows
629310aa Windows support + untabify
8c9ed404 Add CManager ID to contact info and use it for conn_eq
b3097f75 Windows Warnings
eccd8334 bump version
15dcbcde Add another mechanism for getting the hostname
62f7980c Mingw changes
a63862a2 update version
236c8e16 More tweaks for mingw
86ce11b4 Build without perl if not found (ornladios#87)
ee6a7af7 Add missing pregen
b4b3b548 Update CMake for newer verions
* upstream-EVPath: EVPath 2024-12-07 (5663b5a6)
vicentebolea
force-pushed
the
EVup_release
branch
from
d830985 to
c6e681c
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
No description provided.