Skip to content

NIFI-3024 - Encrypt-toolkit flow.xml.gz support#1221

Closed
brosander wants to merge 1 commit intoapache:masterfrom
brosander:NIFI-3024-rebase
Closed

NIFI-3024 - Encrypt-toolkit flow.xml.gz support#1221
brosander wants to merge 1 commit intoapache:masterfrom
brosander:NIFI-3024-rebase

Conversation

@brosander
Copy link
Contributor

Thank you for submitting a contribution to Apache NiFi.

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 NIFI-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 master)?

  • Is your initial contribution a single, squashed commit?

For code changes:

  • Have you ensured that the full suite of tests is executed via mvn -Pcontrib-check clean install at the root nifi folder?
  • Have you written or updated unit tests to verify your changes?
  • - N/A - If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
  • - N/A - If applicable, have you updated the LICENSE file, including the main LICENSE file under nifi-assembly?
  • - N/A - If applicable, have you updated the NOTICE file, including the main NOTICE file found under nifi-assembly?
  • - N/A - If adding new Properties, have you added .displayName in addition to .name (programmatic access) for each of the new properties?

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 travis-ci for build issues and submit an update to your PR as soon as possible.

@brosander brosander force-pushed the NIFI-3024-rebase branch 3 times, most recently from db72bda to 04d6713 Compare November 15, 2016 15:05
@alopresto
Copy link
Contributor

@brosander and I discussed this today and there are a couple small edge cases outstanding. As he will be away from his computer for a few days, I am taking over and will have an updated PR (may need to open a new one as I cannot push to his branch) tomorrow. Will update/close here and link to the new one then.

@olegz
Copy link
Contributor

olegz commented Nov 21, 2016

@brosander not sure if you noticed there is a merge conflict that needs to be addressed

@YolandaMDavis
Copy link
Contributor

@olegz I think @alopresto is taking over this PR and may create a new one, per his comment

@alopresto
Copy link
Contributor

I have created PR 1261 to implement this. Recommend this PR be closed.

@brosander
Copy link
Contributor Author

closing in favor of #1261

@brosander brosander closed this Nov 23, 2016
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.

4 participants