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

MiNiFi 2346 Merge Latest Upstream Main Branch on 051324 #1

Merged
merged 15 commits into from
May 14, 2024

Conversation

james94
Copy link
Owner

@james94 james94 commented May 14, 2024

Thank you for submitting a contribution to Apache NiFi - MiNiFi C++.

In order to streamline the review of the contribution we ask you
to ensure the following steps have been taken:

For all changes:

  • Is there a JIRA ticket associated with this PR? Is it referenced
    in the commit message?

  • Does your PR title start with MINIFICPP-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.

  • Has your PR been rebased against the latest commit within the target branch (typically main)?

  • Is your initial contribution a single, squashed commit?

For code changes:

  • If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
  • If applicable, have you updated the LICENSE file?
  • If applicable, have you updated the NOTICE file?

For documentation related changes:

  • Have you ensured that format looks appropriate for the output in which it is rendered?

Note:

Please ensure that once the PR is submitted, you check GitHub Actions CI results for build issues and submit an update to your PR as soon as possible.

lordgamez and others added 14 commits April 30, 2024 16:05
Closes apache#1769

Signed-off-by: Marton Szasz <szaszm@apache.org>
Closes apache#1774

Signed-off-by: Marton Szasz <szaszm@apache.org>
- Additionally update Zookeeper image version

Closes apache#1777

Signed-off-by: Marton Szasz <szaszm@apache.org>
Closes apache#1762

Signed-off-by: Marton Szasz <szaszm@apache.org>
Closes apache#1773

Signed-off-by: Marton Szasz <szaszm@apache.org>
Closes apache#1781

Signed-off-by: Marton Szasz <szaszm@apache.org>
Closes apache#1780

Signed-off-by: Martin Zink <martinzink@apache.org>
Closes apache#1782

Signed-off-by: Martin Zink <martinzink@apache.org>
Closes apache#1783

Signed-off-by: Martin Zink <martinzink@apache.org>
Closes apache#1784

Signed-off-by: Martin Zink <martinzink@apache.org>
Closes apache#1785

Signed-off-by: Martin Zink <martinzink@apache.org>
Closes apache#1786

Signed-off-by: Marton Szasz <szaszm@apache.org>
Closes apache#1778

Signed-off-by: Marton Szasz <szaszm@apache.org>
Also resolved conflicts, verified I can build MiNiFi using standalone CMake
and conan build approaches and ran GTESTs for both approaches getting at
least 99% GTESTs passing
@james94 james94 self-assigned this May 14, 2024
@james94 james94 merged commit 22205c9 into MINIFICPP-2346 May 14, 2024
4 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants