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 2017/05/09 22:22:04 UTC
[jira] [Commented] (METRON-945) Resolve merge conflict in
metron.spec
[ https://issues.apache.org/jira/browse/METRON-945?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16003658#comment-16003658 ]
ASF GitHub Bot commented on METRON-945:
---------------------------------------
GitHub user dlyle65535 opened a pull request:
https://github.com/apache/incubator-metron/pull/576
METRON-945: Resolve merge conflict in metron.spec
## Contributor Comments
This changeset will allow the rpm build to complete. Currently, master will fail trying to build the rpms. Run full-dev to verify.
## Pull Request Checklist
Thank you for submitting a contribution to Apache Metron.
Please refer to our [Development Guidelines](https://cwiki.apache.org/confluence/pages/viewpage.action?pageId=61332235) for the complete guide to follow for contributions.
Please refer also to our [Build Verification Guidelines](https://cwiki.apache.org/confluence/display/METRON/Verifying+Builds?show-miniview) for complete smoke testing guides.
In order to streamline the review of the contribution we ask you follow these guidelines and ask you to double check the following:
### For all changes:
- [X] 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).
- [X] 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.
- [X] Has your PR been rebased against the latest commit within the target branch (typically master)?
### For code changes:
- [X] Have you included steps to reproduce the behavior or problem that is being changed or addressed?
- [X] Have you included steps or a guide to how the change may be verified and tested manually?
- [X] Have you ensured that the full suite of tests and checks have been executed in the root incubating-metron folder via:
```
mvn -q clean integration-test install && build_utils/verify_licenses.sh
```
- [N/A] Have you written or updated unit tests and or integration tests to verify your changes?
- [N/A] 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)?
- [X] Have you verified the basic functionality of the build by building and running locally with Vagrant full-dev environment or the equivalent?
**Note** - you'll need to change network_host to [ _local_, _site_ ] for this to work, I've opened METRON-946 to track this.
### For documentation related changes:
- [N/A] Have you ensured that format looks appropriate for the output in which it is rendered by building and verifying the site-book? If not then run the following commands and the verify changes via `site-book/target/site/index.html`:
```
cd site-book
mvn site
```
#### Note:
Please ensure that once the PR is submitted, you check travis-ci for build issues and submit an update to your PR as soon as possible.
It is also recommended that [travis-ci](https://travis-ci.org) is set up for your personal repository such that your branches are built there before submitting a pull request.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/dlyle65535/incubator-metron METRON-945
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-metron/pull/576.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 #576
----
commit db009121cd552172e9e6bf7546e1b3df719da3d8
Author: David Lyle <dl...@gmail.com>
Date: 2017-05-09T22:13:43Z
METRON-945: Resolve merge conflict in metron.spec
----
> Resolve merge conflict in metron.spec
> -------------------------------------
>
> Key: METRON-945
> URL: https://issues.apache.org/jira/browse/METRON-945
> Project: Metron
> Issue Type: Bug
> Reporter: David M. Lyle
> Assignee: David M. Lyle
>
> METRON-913 mistakenly introduced a merge conflict in metron.spec. The correct behavior was to keep both.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)