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

GitFlow: Merge develop into main for 2.19.0 release #1446

Merged
merged 90 commits into from
Mar 18, 2022
Merged

GitFlow: Merge develop into main for 2.19.0 release #1446

merged 90 commits into from
Mar 18, 2022

Conversation

mathomp4
Copy link
Member

As the title says, this is to merge develop into main for a release.

tclune and others added 30 commits February 14, 2022 09:55
Co-authored-by: Matthew Thompson <matthew.thompson@nasa.gov>
Instrument MAPL Generic and Cap with these and added a report at the
end of the run.
…-services

New generic set_services is now in place with the legacy interface being
Added new gauge for memory profiling.
…ration

Fixes 1379. Limited the duration of the clock
Co-authored-by: Tom Clune <thomas.l.clune@nasa.gov>
…into-develop-MAPL-2022Feb23

GitFlow: Handmerge of main into develop 2022-Feb-23
Revert "Added new gauge for memory profiling."
mathomp4 and others added 22 commits March 4, 2022 08:28
…hile trying to debug something. Fixed gnu build bug for now
…into-develop-MAPL-2022Mar07

GitFlow: Handmerge main into develop 2022-Mar-07
Bring ExtData2G into develop via optional build argument to cmake
Auto GitFlow - main → develop
@mathomp4 mathomp4 added the 0 Diff The changes in this pull request have verified to be zero-diff with the target branch. label Mar 18, 2022
@mathomp4 mathomp4 self-assigned this Mar 18, 2022
@mathomp4 mathomp4 requested review from a team as code owners March 18, 2022 13:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
0 Diff The changes in this pull request have verified to be zero-diff with the target branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants