Skip to content

Conversation

aaronkaplan
Copy link
Member

merge into master pls

@ghost
Copy link

ghost commented Nov 16, 2020

There are two open pull requests to the branch:

Please resolve them first.

There is also a merge conflict in docs/IntelMQ-3.0-Architecture.md.

Merging into master would mean we do a new feature release (2.3.0) with the current state of the develop branch which contains a development version. Additionally, to keep IntelMQ version numbers in sync with IntelMQ Manager's, we'd need to do a IntelMQ Manger 2.3.0 release but the latter is not yet ready, but we are working on it to make it release-ready. I therefore propose, to not merge into master for now. Alternatively we can do a minimal bugfix release by cherry-picking all the commits to the maintenance branch and make a bugfix release, but I don't think it's worth the effort.

@ghost ghost self-assigned this Nov 16, 2020
@ghost ghost added the documentation Indicates a need for improvements or additions to documentation label Nov 16, 2020
@ghost ghost added this to the 2.3.0 milestone Nov 16, 2020
@ghost ghost removed this from the 2.3.0 milestone Feb 9, 2021
@aaronkaplan
Copy link
Member Author

How is the situation now? I think it should be rather easy to "backport"/cherry pick this markdown document so that it's actually visible in develop/master. After all, it's just a document and no code.

@ghost
Copy link

ghost commented Feb 12, 2021

There is still an open PR to this branch: #1528

And could please squash the commits?

@ghost ghost added the needs: feedback label Aug 20, 2021
@ghost ghost removed their assignment Aug 20, 2021
@kamil-certat
Copy link
Contributor

@aaronkaplan Could you review if this PR is still valid? It looks like something interesting, but I don't know what is still up-to-date

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
documentation Indicates a need for improvements or additions to documentation needs: feedback
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants