You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@metron.apache.org by "ASF GitHub Bot (JIRA)" <ji...@apache.org> on 2018/06/21 15:52:00 UTC
[jira] [Commented] (METRON-1633) Incorrect instructions when
merging PR into feature branch
[ https://issues.apache.org/jira/browse/METRON-1633?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16519533#comment-16519533 ]
ASF GitHub Bot commented on METRON-1633:
----------------------------------------
GitHub user nickwallen opened a pull request:
https://github.com/apache/metron/pull/1074
METRON-1633 Incorrect instructions when merging PR into feature branch
## Description
The 'dev-utilities/committer-utils/prepare-commit' script can be used to merge PRs against a feature branch. The script automatically determines which branch the PR should be merged into based on how the contributor submitted the PR.
Instructions are offered at the end of the script, after the local merge has completed. These instructions are incorrect when merging into a feature branch.
When merging into a feature branch, the instructions say...
```
Review commit carefully then run...
cd /Users/nallen/tmp/metron-pr1056
git push upstream master
```
But they should say...
```
Review commit carefully then run...
cd /Users/nallen/tmp/metron-pr1056
git push upstream feature/METRON-1416-upgrade-solr
```
## Testing
Test merge a PR against a feature branch using a PR like #1056...
```
$ ./dev-utilities/committer-utils/prepare-commit
...using settings from /Users/nallen/.metron-prepare-commit
[1] metron
[2] metron-bro-plugin-kafka
which repo? [1]:
pull request: 1056
local working directory [/Users/nallen/tmp/metron-pr1056]:
origin repo [https://github.com/apache/metron]:
base branch to merge into [feature/METRON-1416-upgrade-solr]:
Cloning into '/Users/nallen/tmp/metron-pr1056'...
remote: Counting objects: 42368, done.
remote: Compressing objects: 100% (56/56), done.
remote: Total 42368 (delta 15), reused 19 (delta 5), pack-reused 42304
Receiving objects: 100% (42368/42368), 59.85 MiB | 10.35 MiB/s, done.
Resolving deltas: 100% (16385/16385), done.
From https://git-wip-us.apache.org/repos/asf/metron
* branch feature/METRON-1416-upgrade-solr -> FETCH_HEAD
* [new branch] feature/METRON-1416-upgrade-solr -> upstream/feature/METRON-1416-upgrade-solr
Branch 'feature/METRON-1416-upgrade-solr' set up to track remote branch 'feature/METRON-1416-upgrade-solr' from 'upstream'.
Switched to a new branch 'feature/METRON-1416-upgrade-solr'
remote: Counting objects: 66, done.
remote: Compressing objects: 100% (22/22), done.
remote: Total 66 (delta 26), reused 52 (delta 24), pack-reused 11
Unpacking objects: 100% (66/66), done.
From https://github.com/apache/metron
* [new ref] refs/pull/1056/head -> pr-1056
github contributor's username [nickwallen]:
github contributor's email [nick@nickallen.org]:
issue identifier in jira [METRON-1609]:
issue description [Elasticsearch settings in Ambari should not be required if Solr is the indexer]:
commit message [METRON-1609 Elasticsearch settings in Ambari should not be required if Solr is the indexer (nickwallen) closes apache/metron#1056]:
Squash commit -- not updating HEAD
Automatic merge went well; stopped before committing as requested
On branch feature/METRON-1416-upgrade-solr
Your branch is up to date with 'upstream/feature/METRON-1416-upgrade-solr'.
nothing to commit, working tree clean
run test suite? [yN]
Review commit carefully then run...
cd /Users/nallen/tmp/metron-pr1056
git push upstream feature/METRON-1416-upgrade-solr
```
Test a merge against master using a PR like #1069.
```
$ ./dev-utilities/committer-utils/prepare-commit
...using settings from /Users/nallen/.metron-prepare-commit
[1] metron
[2] metron-bro-plugin-kafka
which repo? [1]:
pull request: 1069
local working directory [/Users/nallen/tmp/metron-pr1069]:
origin repo [https://github.com/apache/metron]:
base branch to merge into [master]:
Cloning into '/Users/nallen/tmp/metron-pr1069'...
remote: Counting objects: 42368, done.
remote: Compressing objects: 100% (56/56), done.
remote: Total 42368 (delta 15), reused 19 (delta 5), pack-reused 42304
Receiving objects: 100% (42368/42368), 59.85 MiB | 10.13 MiB/s, done.
Resolving deltas: 100% (16385/16385), done.
Checking out files: 100% (2677/2677), done.
From https://git-wip-us.apache.org/repos/asf/metron
* branch master -> FETCH_HEAD
* [new branch] master -> upstream/master
Already on 'master'
Your branch is up to date with 'origin/master'.
Already up to date.
remote: Counting objects: 22, done.
remote: Total 22 (delta 11), reused 11 (delta 11), pack-reused 11
Unpacking objects: 100% (22/22), done.
From https://github.com/apache/metron
* [new ref] refs/pull/1069/head -> pr-1069
github contributor's username [nickwallen]:
github contributor's email [nick@nickallen.org]:
issue identifier in jira [METRON-1624]:
issue description [Set Profiler and Enrichment batch parameters in Ambari]:
commit message [METRON-1624 Set Profiler and Enrichment batch parameters in Ambari (nickwallen) closes apache/metron#1069]:
Squash commit -- not updating HEAD
Automatic merge went well; stopped before committing as requested
[master 31e3bd18] METRON-1624 Set Profiler and Enrichment batch parameters in Ambari (nickwallen) closes apache/metron#1069
Author: nickwallen <ni...@nickallen.org>
5 files changed, 88 insertions(+), 1 deletion(-)
.../src/main/resources/common-services/METRON/CURRENT/configuration/metron-enrichment-env.xml | 12 ++++++++++++
.../src/main/resources/common-services/METRON/CURRENT/configuration/metron-profiler-env.xml | 12 ++++++++++++
.../src/main/resources/common-services/METRON/CURRENT/package/scripts/metron_service.py | 20 ++++++++++++++++++++
.../src/main/resources/common-services/METRON/CURRENT/package/scripts/params/params_linux.py | 4 ++++
.../ambari/metron-mpack/src/main/resources/common-services/METRON/CURRENT/themes/metron_theme.json | 41 ++++++++++++++++++++++++++++++++++++++++-
5 files changed, 88 insertions(+), 1 deletion(-)
31e3bd18 (HEAD -> master) METRON-1624 Set Profiler and Enrichment batch parameters in Ambari (nickwallen) closes apache/metron#1069
run test suite? [yN]
Review commit carefully then run...
cd /Users/nallen/tmp/metron-pr1069
git push upstream master
```
## Pull Request Checklist
- [ ] Is there a JIRA ticket associated with this PR? If not one needs to be created at [Metron Jira](https://issues.apache.org/jira/browse/METRON/?selectedTab=com.atlassian.jira.jira-projects-plugin:summary-panel).
- [ ] Does your PR title start with METRON-XXXX where XXXX is the JIRA number you are trying to resolve? Pay particular attention to the hyphen "-" character.
- [ ] Has your PR been rebased against the latest commit within the target branch (typically master)?
- [ ] Have you included steps to reproduce the behavior or problem that is being changed or addressed?
- [ ] Have you included steps or a guide to how the change may be verified and tested manually?
- [ ] Have you ensured that the full suite of tests and checks have been executed in the root metron folder via:
- [ ] Have you written or updated unit tests and or integration tests to verify your changes?
- [ ] If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under [ASF 2.0](http://www.apache.org/legal/resolved.html#category-a)?
- [ ] Have you verified the basic functionality of the build by building and running locally with Vagrant full-dev environment or the equivalent?
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/nickwallen/metron METRON-1633
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/metron/pull/1074.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 #1074
----
----
> Incorrect instructions when merging PR into feature branch
> ----------------------------------------------------------
>
> Key: METRON-1633
> URL: https://issues.apache.org/jira/browse/METRON-1633
> Project: Metron
> Issue Type: Bug
> Reporter: Nick Allen
> Assignee: Nick Allen
> Priority: Minor
>
> The 'dev-utilities/committer-utils/prepare-commit' script can be used to merge PRs against a feature branch. The script automatically determines which branch the PR should be merged into based on how the contributor submitted the PR.
> Instructions are offered at the end of the script, after the local merge has completed. These instructions are incorrect when merging into a feature branch.
> When merging into a feature branch, the instructions say...
> {code}
> Review commit carefully then run...
> cd /Users/nallen/tmp/metron-pr1056
> git push upstream master
> {code}
> But they should say...
> {code}
> Review commit carefully then run...
> cd /Users/nallen/tmp/metron-pr1056
> git push upstream feature/METRON-1416-upgrade-solr
> {code}
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)