Github user rickysaltzer commented on the pull request:
https://github.com/apache/nifi/pull/91#issuecomment-149631055
The conflict was inside of the `pom.xml` inside the `nifi-nar-bundles`
module. The new couchbase module was conflicting with the new riemann module
inside the `<modules>` stanza. I made sure both modules are in there, and
rebased the branch on the current upstream master.
---
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.
---
