You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@nifi.apache.org by ToivoAdams <gi...@git.apache.org> on 2016/04/28 18:02:48 UTC
[GitHub] nifi pull request: nifi-1214b Mock Framework should allow order-in...
GitHub user ToivoAdams opened a pull request:
https://github.com/apache/nifi/pull/388
nifi-1214b Mock Framework should allow order-independent assumptions …
nifi-1214b Mock Framework should allow order-independent assumptions on FlowFiles. This replaces previous nifi-1214
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/ToivoAdams/nifi nifi-1214b
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/nifi/pull/388.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #388
----
commit 11059e3c5da101059498dccd95da58ffaecfdab6
Author: Toivo Adams <to...@gmail.com>
Date: 2016-04-28T15:50:35Z
nifi-1214b Mock Framework should allow order-independent assumptions on FlowFiles. This replaces previous nifi-1214
----
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi issue #388: nifi-1214b Mock Framework should allow order-independent as...
Posted by JPercivall <gi...@git.apache.org>.
Github user JPercivall commented on the issue:
https://github.com/apache/nifi/pull/388
Hey @ToivoAdams, looks like this has merge conflicts. Could you address them?
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi pull request #388: nifi-1214b Mock Framework should allow order-indepen...
Posted by ToivoAdams <gi...@git.apache.org>.
Github user ToivoAdams closed the pull request at:
https://github.com/apache/nifi/pull/388
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi issue #388: nifi-1214b Mock Framework should allow order-independent as...
Posted by ToivoAdams <gi...@git.apache.org>.
Github user ToivoAdams commented on the issue:
https://github.com/apache/nifi/pull/388
I hope conflicts are now resolved.
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] nifi issue #388: nifi-1214b Mock Framework should allow order-independent as...
Posted by JPercivall <gi...@git.apache.org>.
Github user JPercivall commented on the issue:
https://github.com/apache/nifi/pull/388
Hey @ToivoAdams, you didn't properly rebase. If you double check this PR, you brought in 250+ commits that change 2,163 different files. What you should have done is rebase your commits on top of the latest master and then force pushed to your branch.
Currently I think the best way forward is to create a new branch off of the latest master, where you a new commit with your changes on top of it and create a new PR.
---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---