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.

Sign up for GitHub

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

Jump to bottom

GitFlow: Handmerge main into develop 2022-Feb-16 #1373

Merged
merged 9 commits into from
Feb 16, 2022
Merged

GitFlow: Handmerge main into develop 2022-Feb-16 #1373

merged 9 commits into from
Feb 16, 2022

Conversation

mathomp4
Copy link
Member

@mathomp4 mathomp4 commented Feb 16, 2022 •
edited
Loading

Description

This is a handmerge of main into develop. I think I've fixed things up so that the merge is correct with the new more configurable history. I'll do a build of GEOS to make sure.

Related Issue

Motivation and Context

Pulls in hotfix

How Has This Been Tested?

Tested with GEOSgcm. Zero-diff.

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Trivial change (affects only documentation or cleanup)

Checklist:

  • I have tested this change with a run of GEOSgcm (if non-trivial)
  • I have added one of the required labels (0 diff, 0 diff trivial, 0 diff structural, non 0-diff)
  • I have updated the CHANGELOG.md accordingly following the style of Keep a Changelog

@mathomp4 mathomp4 added the 0 Diff The changes in this pull request have verified to be zero-diff with the target branch. label Feb 16, 2022
@mathomp4 mathomp4 self-assigned this Feb 16, 2022
@mathomp4 mathomp4 mentioned this pull request Feb 16, 2022
Closed
@mathomp4 mathomp4 changed the title Handmerge main into develop 2022-Feb-16 GitFlow: Handmerge main into develop 2022-Feb-16 Feb 16, 2022
@mathomp4
Copy link
Member Author

I didn't touch the ADAS! Grah. Relaunch

@mathomp4 mathomp4 marked this pull request as ready for review February 16, 2022 19:21
@mathomp4 mathomp4 requested review from a team as code owners February 16, 2022 19:21
@mathomp4 mathomp4 merged commit b05beb8 into develop Feb 16, 2022
@mathomp4 mathomp4 deleted the merge/mathomp4/handmerge-main-into-develop-MAPL-2022Feb16 branch February 16, 2022 20:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bena-nasa bena-nasa bena-nasa approved these changes

Assignees

@mathomp4 mathomp4

Labels
0 Diff The changes in this pull request have verified to be zero-diff with the target branch.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mathomp4 @bena-nasa