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

ENTESB-12107 Add AMQP Service Port in template. Set fuse-7.x.redhat a… #86

Merged
merged 1 commit into from Oct 25, 2019

Conversation

johnpoth
Copy link
Contributor

@oscerd
Copy link
Member

oscerd commented Oct 25, 2019

I think the branch is 2.1.x.redhat-7-x

Copy link
Member

@oscerd oscerd left a comment

Choose a reason for hiding this comment

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

I think the branch is another one.

@johnpoth
Copy link
Contributor Author

Hi @oscerd, yes I will merge in there to once this gets merged

My thinking from @astefanutti 's comment was a fix for 7.5 should go:

master -> 2.1.x.redhat-7-x -> 2.1.x.redhat-7-5-x

But I may be wrong as one could argue the purpose of two "master" branches in this case master and 2.1.x.redhat-7-x. I guess they diverge in some way.

@oscerd
Copy link
Member

oscerd commented Oct 25, 2019

ok. Approved then.

@johnpoth johnpoth merged commit 9bbd742 into master Oct 25, 2019
@johnpoth johnpoth deleted the ENTESB-12107 branch October 25, 2019 14:49
@johnpoth
Copy link
Contributor Author

Thanks @oscerd !

@astefanutti
Copy link
Contributor

My thinking from @astefanutti 's comment was a fix for 7.5 should go:
master -> 2.1.x.redhat-7-x -> 2.1.x.redhat-7-5-x

+1 that's the ideal in an open-source world 😉. That questions the purpose of the 2.1.x.redhat-7-x branch though :)

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.

None yet

3 participants