Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deactivate campaign recording by default. Use .adios-campaign/ as dir… #4174

Merged
merged 1 commit into from
May 23, 2024

Conversation

pnorbert
Copy link
Contributor

…ectory name. Fixes #4148

@pnorbert pnorbert added this to the v2.10.1 milestone May 23, 2024
@pnorbert pnorbert requested a review from eisenhauer May 23, 2024 18:04
@eisenhauer
Copy link
Member

Changes look good. WRT the windows build failures: Something must have changed in the CI images and now we're failing where we used to pass. I incorporated fixes for this into an Xrootd PR so I could merge it, but that was probably a mistake not do fix that in a separate PR so it could be more easily pulled into release. If you can cherry-pick these commits, it will fix it: 8c62c57 and bdc78df.

@pnorbert
Copy link
Contributor Author

I don't find these commits.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

@eisenhauer
Copy link
Member

Huh.

bdc78df
8c62c57

@eisenhauer
Copy link
Member

Huh.

bdc78df 8c62c57

Oh, I bet because they got squashed upon merge...

@eisenhauer
Copy link
Member

Oh, I bet because they got squashed upon merge...

Not sure how best to handle that then...

@pnorbert
Copy link
Contributor Author

And failing to do a patch either.

$ git diff  master --  examples/hello/hdf5SubFile/hdf5SubFile.cpp  > patch
$ git apply patch
error: patch failed: examples/hello/hdf5SubFile/hdf5SubFile.cpp:14
error: examples/hello/hdf5SubFile/hdf5SubFile.cpp: patch does not apply

@pnorbert pnorbert force-pushed the fix-adios-campaign-dir branch from 0ed08d6 to 85cd036 Compare May 23, 2024 22:07
@pnorbert pnorbert merged commit c2a9464 into ornladios:release_210 May 23, 2024
39 checks passed
@pnorbert pnorbert deleted the fix-adios-campaign-dir branch May 23, 2024 23:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants