[GitHub] nifi issue #2617: NIFI-5055 added ability to unpenalize MockFlowFile directl...

2018-04-11 Thread markobean
Github user markobean commented on the issue:

https://github.com/apache/nifi/pull/2617
  
Changes committed to master. Closing PR.


---


[GitHub] nifi issue #2617: NIFI-5055 added ability to unpenalize MockFlowFile directl...

2018-04-11 Thread pvillard31
Github user pvillard31 commented on the issue:

https://github.com/apache/nifi/pull/2617
  
That's correct @markobean - it has been merged into master with 
274ed46d923e7d080b57ed121596b4ecfa997a2c.


---


[GitHub] nifi issue #2617: NIFI-5055 added ability to unpenalize MockFlowFile directl...

2018-04-10 Thread markobean
Github user markobean commented on the issue:

https://github.com/apache/nifi/pull/2617
  
So, does this PR need to be manually closed with the "Close and comment" 
button? 


---


[GitHub] nifi issue #2617: NIFI-5055 added ability to unpenalize MockFlowFile directl...

2018-04-10 Thread MikeThomsen
Github user MikeThomsen commented on the issue:

https://github.com/apache/nifi/pull/2617
  
@pvillard31 Thanks. I finally figured it out after doing a second one today.


---


[GitHub] nifi issue #2617: NIFI-5055 added ability to unpenalize MockFlowFile directl...

2018-04-10 Thread pvillard31
Github user pvillard31 commented on the issue:

https://github.com/apache/nifi/pull/2617
  
@MikeThomsen - just fyi, while merging a PR it's highly recommended to 
amend the commit message to include the magic words that will automatically 
close the github PR. The commands I usually execute when merging a PR are:


git checkout master
git pull origin master
git fetch github
git checkout github/pr/
git checkout -b pr
--- here you can do additional reviewing, maven builds, test with a running 
instance, etc ---
git commit --amend -s
--- you update the commit message to include "This closes #."
git log
--- the above command is to retrieve the commit ID ---
git checkout master
git cherry-pick 
git push origin master


This is an example - there are probably other ways to do it.


---


[GitHub] nifi issue #2617: NIFI-5055 added ability to unpenalize MockFlowFile directl...

2018-04-10 Thread MikeThomsen
Github user MikeThomsen commented on the issue:

https://github.com/apache/nifi/pull/2617
  
@markobean You close the PR now. I merged the change.


---


[GitHub] nifi issue #2617: NIFI-5055 added ability to unpenalize MockFlowFile directl...

2018-04-09 Thread markobean
Github user markobean commented on the issue:

https://github.com/apache/nifi/pull/2617
  
Updated to use assertTrue and assertFalse. I had simply borrowed 
assertEquals from the previous unit test. So, while updating, I updated that 
test to use assertTrue as well. Commit, squashed and pushed.



---


[GitHub] nifi issue #2617: NIFI-5055 added ability to unpenalize MockFlowFile directl...

2018-04-09 Thread ottobackwards
Github user ottobackwards commented on the issue:

https://github.com/apache/nifi/pull/2617
  
Looks good to me


---