Skip to content

Hotfix 121 incorrect usage inheritance#122

Merged
edwinvandenbelt merged 4 commits intoTOMP-WG:hotfix-1.2.1from
edwinvandenbelt:hotfix_121_incorrect_usage_inheritance
Apr 1, 2020
Merged

Hotfix 121 incorrect usage inheritance#122
edwinvandenbelt merged 4 commits intoTOMP-WG:hotfix-1.2.1from
edwinvandenbelt:hotfix_121_incorrect_usage_inheritance

Conversation

@edwinvandenbelt
Copy link
Collaborator

No description provided.

@edwinvandenbelt edwinvandenbelt linked an issue Mar 31, 2020 that may be closed by this pull request
@edwinvandenbelt edwinvandenbelt added this to the 1.2.1 milestone Mar 31, 2020
@ARBaart ARBaart changed the base branch from master to hotfix-1.2.1 April 1, 2020 11:20
@ARBaart
Copy link
Contributor

ARBaart commented Apr 1, 2020

I've updated the destination branches where I thought there should be changes. Because there are two hotfix PRs I've created a hotfix-1.2.1 branch for them to be merged into. This way, they can be added to master in one commit which can be tagged as v1.2.1, instead of having a "halfway" commit.

@edwinvandenbelt edwinvandenbelt merged commit ef4405a into TOMP-WG:hotfix-1.2.1 Apr 1, 2020
@edwinvandenbelt edwinvandenbelt deleted the hotfix_121_incorrect_usage_inheritance branch April 2, 2020 06:26
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.

Incorrect usage openAPI inheritance

2 participants