pepov commented on issue #3257: NIFI-5435 Prometheus /metrics http endpoint for monitoring integration URL: https://github.com/apache/nifi/pull/3257#issuecomment-467010401 I would suggest to get rid of the unnecessary merges and rebase your work on the current master. First add apache remote and update it if you haven't already: ``` git remote add apache https://github.com/apache/nifi git fetch apache ``` Then for example create a temporary branch from your current head ``` git checkout -b NIFI-5435-tmp NIFI-5435 ``` then go back to NIFI-5435 and reset it to apache master ``` git checkout NIFI-5435 git reset apache/master --hard ``` Then you can cherry pick the relevant commits, without the merges from your tmp branch: ``` $ git log apache/master..NIFI-5435-tmp --no-merges --pretty=oneline --abbrev-commit 6b316416b NIFI-5435 Formated Code to adhere to NiFi checkstyle and Suggested code changes e8deefa56 NIFI-5435 Added Counters exposed by processors 518fb6903 Update PrometheusMetricsFactory.java fa9bb0e49 Update pom.xml 060bfb35a NIFI-5435 Adding Prometheus /metrics http endpoint d19329063 NIFI-5435 Added Counters exposed by processors b5f68a02c Update PrometheusMetricsFactory.java 8534288c8 Update pom.xml 7c1daf245 NIFI-5435 Adding Prometheus /metrics http endpoint ``` Or you can create a diff and add it as a single commit: ``` git apply <(git diff apache/master..NIFI-5435-tmp) git add . git commit -m ... ```
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
