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

Merge v2.10.x into main #2283

Merged
merged 4 commits into from
Dec 19, 2023
Merged

Merge v2.10.x into main #2283

merged 4 commits into from
Dec 19, 2023

Conversation

schlunma
Copy link
Contributor

@schlunma schlunma commented Dec 19, 2023

Description

Merge v2.10.x into main to get versioning correctly.


Checklist

It is the responsibility of the author to make sure the pull request is ready to review. The icons indicate whether the item will be subject to the 🛠 Technical or 🧪 Scientific review.


To help with the number pull requests:

valeriupredoi and others added 4 commits December 19, 2023 14:11
Co-authored-by: Bouwe Andela <b.andela@esciencecenter.nl>
Co-authored-by: Manuel Schlund <32543114+schlunma@users.noreply.github.com>
Copy link

codecov bot commented Dec 19, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (444cdbf) 93.47% compared to head (11e5b1e) 93.47%.
Report is 11 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #2283   +/-   ##
=======================================
  Coverage   93.47%   93.47%           
=======================================
  Files         238      238           
  Lines       12932    12932           
=======================================
  Hits        12088    12088           
  Misses        844      844           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@schlunma schlunma added this to the v2.10.0 milestone Dec 19, 2023
@schlunma schlunma added the enhancement New feature or request label Dec 19, 2023
@schlunma schlunma requested a review from bouweandela December 19, 2023 16:49
@schlunma schlunma marked this pull request as ready for review December 19, 2023 16:49
@schlunma
Copy link
Contributor Author

I am not sure why this PR shows changes. My local

git checkout main
git merge origin/v2.10.x

results in no change at all (same as if I did git merge origin/v2.10.x -s ours.

@schlunma schlunma changed the base branch from main to 4C_ECs December 19, 2023 16:54
@schlunma schlunma changed the base branch from 4C_ECs to main December 19, 2023 16:55
@bouweandela bouweandela merged commit 403694b into main Dec 19, 2023
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants