You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@metron.apache.org by nickwallen <gi...@git.apache.org> on 2018/06/21 20:41:56 UTC
[GitHub] metron pull request #1075: METRON-1625 Merge master into Solr feature branch
GitHub user nickwallen opened a pull request:
https://github.com/apache/metron/pull/1075
METRON-1625 Merge master into Solr feature branch
Merges the latest from master into the Solr feature branch.
## 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 SOLR-MERGE-MASTER-20180621
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/metron/pull/1075.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 #1075
----
commit 0bb358009f1823fd19682ddb18d00aefa1441bf6
Author: nickwallen <ni...@...>
Date: 2018-06-18T15:29:53Z
METRON-1573 Enhance KAFKA_* functions to return partition and offset details (nickwallen) closes apache/metron#1030
commit 36b20297b7f385202387b22087a5e85d92e55bc7
Author: merrimanr <me...@...>
Date: 2018-06-18T21:35:51Z
METRON-1616 Changing alert status fails if no metaalerts have been created yet (merrimanr) closes apache/metron#1061
commit 742734885a215a4a9a363b8e5a88c37fd8e3010d
Author: nickwallen <ni...@...>
Date: 2018-06-19T16:28:43Z
METRON-1599 Allow user to define global property 'source.type.field' in Ambari (nickwallen) closes apache/metron#1047
commit 53d074f895e658efca10f046866c33e153010640
Author: nickwallen <ni...@...>
Date: 2018-06-19T17:35:49Z
METRON-1622 Allow user to define global property 'threat.triage.score.field' in Ambari (nickwallen) closes apache/metron#1066
commit 29d6e900c23b9808cb486a153313125cf8d290e4
Author: justinleet <ju...@...>
Date: 2018-06-19T18:18:02Z
METRON-1611 Increment master version number to 0.5.1 for on-going development (justinleet) closes apache/metron#1057
commit e30f77a023983235a0cb835d977f146ee02d8045
Author: sardell <sa...@...>
Date: 2018-06-20T14:52:52Z
METRON-1626 Alerts UI: An empty result is returned when searching for a single alert contained in a metaalert (sardell via nickwallen) closes apache/metron#1068
commit e7efd48d1402b1619c4ab5fc36ce4a7c5b0a058d
Author: sardell <sa...@...>
Date: 2018-06-20T15:36:47Z
METRON-1627 Alerts UI: Metaalert details missing in details panel when trying to add alert to existing metaalert (sardell via justinleet) closes apache/metron#1070
commit 6a325cb5b5971fb7e2e3ab8d4407cccab0c784ec
Author: merrimanr <me...@...>
Date: 2018-06-21T15:39:30Z
METRON-1630 Add threat.triage.score.field to READMEs (merrimanr) closes apache/metron#1073
commit 78d5dbd82b8580586f547743c6c55c3f55591f0d
Author: Nick Allen <ni...@...>
Date: 2018-06-21T20:26:28Z
Merge remote-tracking branch 'apache/master' into SOLR-MERGE-MASTER-20180621
----
---
[GitHub] metron pull request #1075: METRON-1625 Merge master into Solr feature branch
Posted by nickwallen <gi...@git.apache.org>.
Github user nickwallen closed the pull request at:
https://github.com/apache/metron/pull/1075
---
[GitHub] metron issue #1075: METRON-1625 Merge master into Solr feature branch
Posted by justinleet <gi...@git.apache.org>.
Github user justinleet commented on the issue:
https://github.com/apache/metron/pull/1075
+1 by inspection. We've generally been just taking care of merging master into the feature branch unless there were special circumstances, but I've no objection to doing it this way.
---