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

FISH-9332: use a new branch for Cargotracker #6944

Merged
merged 2 commits into from
Sep 12, 2024
Merged

FISH-9332: use a new branch for Cargotracker #6944

merged 2 commits into from
Sep 12, 2024

Conversation

astoica1
Copy link
Contributor

Description

Important Info

Blockers

Testing

New tests

Testing Performed

Testing Environment

Documentation

Notes for Reviewers

Pandrex247
Pandrex247 reviewed Sep 11, 2024
View reviewed changes
Copy link
Member

@Pandrex247 Pandrex247 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems to work! So I suggest that we merge the cargotracker6 branch into Payara6 over in our cargotracker fork so we don't end up with an abandoned branch (and adjust the branch checked out in this this PR back to Payara6 once that's merged).

@astoica1
Copy link
Contributor Author

Seems to work! So I suggest that we merge the cargotracker6 branch into Payara6 over in our cargotracker fork so we don't end up with an abandoned branch (and adjust the branch checked out in this this PR back to Payara6 once that's merged).

Agreed. Before merging this branch, we need to rename https://github.com/payara/cargotracker/tree/cargotracker6 to Payara6

Pandrex247
Pandrex247 approved these changes Sep 11, 2024
View reviewed changes
Copy link
Member

@Pandrex247 Pandrex247 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cargotracker branches renamed to retain their respective histories.
What was Payara6 has been renamed to Payara6-old and what was cargotracker6 has been renamed to Payara6.

@astoica1 astoica1 merged commit accb88d into payara:main Sep 12, 2024
1 check passed
@astoica1 astoica1 deleted the FISH-9332-update-cargotracker branch September 12, 2024 06:20
Pandrex247 pushed a commit to Pandrex247/Payara that referenced this pull request Sep 16, 2024
@astoica1 @Pandrex247
Merge pull request payara#6944 from astoica1/FISH-9332-update-cargotr…
a2bfc8e 
…acker

FISH-9332: use a new branch for Cargotracker
Pandrex247 pushed a commit to Pandrex247/Payara that referenced this pull request Sep 16, 2024
@astoica1 @Pandrex247
Merge pull request payara#6944 from astoica1/FISH-9332-update-cargotr…
05f9fed 
…acker

FISH-9332: use a new branch for Cargotracker
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Pandrex247 Pandrex247 Pandrex247 approved these changes

@kalinchan kalinchan Awaiting requested review from kalinchan

@aubi aubi Awaiting requested review from aubi

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@astoica1 @Pandrex247