Github user trixpan commented on the issue:
https://github.com/apache/nifi/pull/1016
hey @brianburnett thank you for submiting a new commit.
You seem to have merged the mater into your PR? You should have instead
rebased the PR to master.
Please refer to the following comments to revisit how to fix it.
https://github.com/apache/nifi/pull/1016#issuecomment-280458891
Cheers!
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---
