[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user jdye64 commented on the issue: https://github.com/apache/nifi/pull/1016 @brianburnett once you make the recommended changes I can help you with the rebasing effort. ---

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user brianburnett commented on the issue: https://github.com/apache/nifi/pull/1016 It was my intent to finish pushing this through. I can make the recommended changes but may need some assistance rebasing to the current version. ---

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user MikeThomsen commented on the issue: https://github.com/apache/nifi/pull/1016 @pvillard31 If he doesn't respond, I can take a stab at addressing the feedback so this can be closed out. ---

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user MikeThomsen commented on the issue: https://github.com/apache/nifi/pull/1016 @brianburnett You didn't respond to the feedback from @pvillard31. Do you need help getting this pushed through? ---

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user brianburnett commented on the issue: https://github.com/apache/nifi/pull/1016 Everything looks ok on my side but I see another merge conflict. Top down compiled with the contrib-check. Possible to get detailed instructions on what I need to do? --- If your project is

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user trixpan commented on the issue: https://github.com/apache/nifi/pull/1016 @brianburnett still not rebased correctly. My suggestion is to do again the trick of branching from the master git checkout master -b nifi-2724v3 git cherry-pick your commit hash git

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user brianburnett commented on the issue: https://github.com/apache/nifi/pull/1016 Ok - passed contrib-check and should be properly rebased. --- 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

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

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

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user trixpan commented on the issue: https://github.com/apache/nifi/pull/1016 @brianburnett there's a minor conflict but I am more concerned with consistent failures when I run the test units? Have you been able to build this with `-Pcontrib-check` ? --- If your

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user trixpan commented on the issue: https://github.com/apache/nifi/pull/1016 Looks good. Will review --- 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

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user brianburnett commented on the issue: https://github.com/apache/nifi/pull/1016 Got some outside assistance but believe I have the rebase done correctly now. Could you verify - Thanks! --- If your project is set up for it, you can reply to this email and have your reply

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user automaticgiant commented on the issue: https://github.com/apache/nifi/pull/1016 @trixpan cherry-pick complete. what say you? --- 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

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user trixpan commented on the issue: https://github.com/apache/nifi/pull/1016 @brianburnett I suspect the reason for that is because you are trying to cherry-pick from the branch you already have a commit. Note how I suggested you to circle around...

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user brianburnett commented on the issue: https://github.com/apache/nifi/pull/1016 $git log commit df73bdc7f0f13d4f21b23a8a0a41f78fa0386aa2 Author: brianburnett Date: Thu Feb 16 11:55:55 2017 -0500 NIFI-2724 JMX Processor

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user trixpan commented on the issue: https://github.com/apache/nifi/pull/1016 No no. Cherry pick your commit number. You will likely to fix conflicts in the process but git will flag those files with conflict so once you fix it should be ok at the end --- If your

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user brianburnett commented on the issue: https://github.com/apache/nifi/pull/1016 Didn't your previous post. git cherry-pick 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

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user trixpan commented on the issue: https://github.com/apache/nifi/pull/1016 Try git checkout master -b nifi-2724v2 git cherry-pick your commit hash git push - f origin nifi-2724 This will create a temporary branch Allow you to copy a commit from

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user brianburnett commented on the issue: https://github.com/apache/nifi/pull/1016 Dang - I have little git experience. Know the best way to move forward from here? --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user trixpan commented on the issue: https://github.com/apache/nifi/pull/1016 Try git checkout master -b nifi-2724v2 git cherry-pick git push origin nifi-2724 --- If your project is set up for it, you can reply to this email and have your reply appear on

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user trixpan commented on the issue: https://github.com/apache/nifi/pull/1016 That was a merge, not a rebase :-( --- 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

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user brianburnett commented on the issue: https://github.com/apache/nifi/pull/1016 Rebased - jumped through some git hoops but I believe it is current. Let me know. Thanks --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user joewitt commented on the issue: https://github.com/apache/nifi/pull/1016 @brianburnett looks like there has been good review/edit cycles here. Can you rebase and push and advise when ready for a last look. I can imagine a lot of folks will be pleased to have this. ---

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user trixpan commented on the issue: https://github.com/apache/nifi/pull/1016 @brianburnett can't you simply rebase? 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

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user brianburnett commented on the issue: https://github.com/apache/nifi/pull/1016 The previous commit introduced a bug which I corrected with this last commit. There is now a conflict in the nifi-nar-bundles pom with websocket and jmx bundle modules. Just curious how you

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user trixpan commented on the issue: https://github.com/apache/nifi/pull/1016 Seems fixed. Will start reviewing --- 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

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user brianburnett commented on the issue: https://github.com/apache/nifi/pull/1016 I think that the commit is now amended correctly - possible to verify? --- 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

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user trixpan commented on the issue: https://github.com/apache/nifi/pull/1016 @brianburnett seems to be better now. I also suggest you run $ git commit --amend and remove the ``` # The first commit's message is: ``` and ``` #

[GitHub] nifi issue #1016: NIFI-2724 New JMX Processor

Github user trixpan commented on the issue: https://github.com/apache/nifi/pull/1016 @brianburnett would you be able to rebase and squash this PR? It currently includes other people commits that already have been merged to the master codebase --- If your project is set up for it,