GitHub user ottobackwards opened a pull request:

    https://github.com/apache/metron/pull/752

    METRON-1136 [Feature Branch] Merge master 9/12

    This PR merges master as of this time 9/12, and fixes any merge issues.
    
    ## Testing
    This is a non-regression check
    
    [ ] Builds and Tests
    [ ] full dev with data in kibana, grok parser testing works etc.
    
    
    ### 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:
    - [na] Have you included steps to reproduce the behavior or problem that is 
being changed or addressed?
    - [na] 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 metron folder via:
      ```
      mvn -q clean integration-test install && build_utils/verify_licenses.sh 
      ```
    
    - [na] Have you written or updated unit tests and or integration tests to 
verify your changes?
    - [na] 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?


You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/ottobackwards/metron ext-master-9-12

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/metron/pull/752.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 #752
    
----
commit 8ee9eb8007ce3c0bbca553e8c4b5d861300d1a00
Author: Simon Elliston Ball <si...@simonellistonball.com>
Date:   2017-08-30T18:35:39Z

    METRON-1139 Fixed service advisor profilerHost variable closes 
apache/incubator-metron#722

commit cd14cbeefec6afc7aee9efcc288c9482d67d9657
Author: anandsubbu <asubraman...@hortonworks.com>
Date:   2017-08-31T12:14:12Z

    METRON-1137 Build RPM for Metron MaaS as a part of rpm-docker packaging 
(anandsubbu via nickwallen) closes apache/metron#719

commit 1a4f19c86ed94742c08e8e264a7bb45ff9ad27a6
Author: nickwallen <n...@nickallen.org>
Date:   2017-08-31T14:10:53Z

    METRON-1117 Filter Functions Returned by `%functions` (nickwallen) closes 
apache/metron#704

commit c73c7af1dc3cb6502517bc7ac1d37c631ec3dbe5
Author: nickwallen <n...@nickallen.org>
Date:   2017-08-31T14:38:21Z

    METRON-1132 Enhance Profiler Debug Functions (nickwallen) closes 
apache/metron#716

commit 8ef18d31ab927acad7798c6c32252ca27c8e8b46
Author: nickwallen <n...@nickallen.org>
Date:   2017-08-31T14:51:53Z

    METRON-1138 Improve Error Message with Bad Profile Expression (nickwallen) 
closes apache/metron#721

commit 38eebd59ce2884ead7f3797ff98f7308409e05dd
Author: cstella <ceste...@gmail.com>
Date:   2017-08-31T19:46:29Z

    METRON-1134: Allow parser command line options to be specified in the 
zookeeper parser config. closes apache/incubator-metron#717

commit 31d99f122e89d81590df84f66c2dc9fb336a03b8
Author: cstella <ceste...@gmail.com>
Date:   2017-08-31T19:48:01Z

    METRON-1145: Profiler mpack does not create kafka acl and hbase acls 
correctly in kerberized cluster closes apache/incubator-metron#726

commit 91a017b6dcefc250bfd67cecf9803cb59015d213
Author: cstella <ceste...@gmail.com>
Date:   2017-09-05T14:18:25Z

    METRON-1148: Add SET and MULTISET data structures to stellar closes 
apache/incubator-metron#728

commit 37e8ca7e22f0a16c9bbccd9d9896942f230a11b8
Author: nickwallen <n...@nickallen.org>
Date:   2017-09-05T14:40:47Z

    METRON-1129 Management UI - Package Node Dependencies in RPM (nickwallen) 
closes apache/metron#712

commit 7a3de6737b964abbdcdc876695b50f29bf5d531e
Author: merrimanr <merrim...@gmail.com>
Date:   2017-09-05T21:15:32Z

    METRON-1127 Add ability to escalate alerts for external consumption 
(merrimanr) closes apache/metron#711

commit 0bbc51d6858c67015ec7dde3105069f4a678d518
Author: nickwallen <n...@nickallen.org>
Date:   2017-09-08T10:38:49Z

    METRON-1160 Blueprint configuration validation failed: Missing required 
properties (nickwallen via justinleet) closes apache/metron#735

commit dd7118197ea09550192d82161cda4e0614a62b35
Author: cstella <ceste...@gmail.com>
Date:   2017-09-08T13:17:58Z

    METRON-1142: Add Geo Hashing functions to stellar closes 
apache/incubator-metron#724

commit f79214be9bcabca3b8b9411e17915c2de5236ea8
Author: merrimanr <merrim...@gmail.com>
Date:   2017-09-08T13:19:39Z

    METRON-1151: Grok patterns in HDFS should be owned by metron this closes 
apache/incubator-metron#730

commit 224d3d5e2b8c17ca4414ad7d7846dafee0b06d3b
Author: merrimanr <merrim...@gmail.com>
Date:   2017-09-08T14:43:29Z

    METRON-1150 REST parseMessage endpoint fails with Unable to load &lt;grok 
file&gt; from either classpath or HDFS (merrimanr) closes apache/metron#729

commit f0ae85fb71bf1d102d9b72f6b413a89abe8b4bd4
Author: cstella <ceste...@gmail.com>
Date:   2017-09-08T19:04:44Z

    METRON-1166: Stellar short circuiting fails when a complex condition using 
a boolean op is followed by the opposite boolean op this closes 
apache/incubator-metron#738

commit 6ff39ae380d82fb5805f4092806b846332c3c8b8
Author: nickwallen <n...@nickallen.org>
Date:   2017-09-08T21:15:22Z

    METRON-1162 Apply Live Messages to the Profile Debugger (nickwallen) closes 
apache/metron#736

commit ea65a37c04c2e0d8fad1f1ea024af39ae56049ca
Author: iraghumitra <raghumitra....@gmail.com>
Date:   2017-09-08T22:56:39Z

    METRON-1077 Use column meta data end point in alerts ui (iraghumitra via 
merrimanr) closes apache/metron#700

commit 7768ff673cb4a7a62180d16fdb92dc0f4123f4f1
Author: cstella <ceste...@gmail.com>
Date:   2017-09-09T00:26:06Z

    METRON-1168: Add SUBSTRING method to stellar this closes 
apache/incubator-metron#742

commit ccb5a0bdd4cb7d04c0d1f23359215ffb643774b5
Author: mattf-horton <mfo...@hortonworks.com>
Date:   2017-09-09T00:27:32Z

    METRON-1163 RAT failures for metron-interface/metron-alerts closes 
apache/incubator-metron#743

commit b0c6e68ce5a3e9caa12711cf76aed1776d3745db
Author: justinleet <justinjl...@gmail.com>
Date:   2017-09-09T00:30:02Z

    METRON-1153 HDFS HdfsWriter never recovers from exceptions closes 
apache/incubator-metron#741

commit 269d42e923c23835871c9bbc23c4ab0c6007abc4
Author: cstella <ceste...@gmail.com>
Date:   2017-09-09T01:30:03Z

    METRON-1169: dependency checker has not been running in travis closes 
apache/incubator-metron#744

commit 3828160625c6617db99d9a640fdb6b84d4f91f4f
Author: cstella <ceste...@gmail.com>
Date:   2017-09-10T01:33:13Z

    METRON-1171: Better validation for the SUBSTRING stellar function closes 
apache/incubator-metron#745

commit 2afe9d7f5d277e52928946e7b53267aa5115ae0a
Author: nickwallen <n...@nickallen.org>
Date:   2017-09-11T15:40:42Z

    METRON-1167 Define Session Specific Global Configuration Values in the REPL 
(nickwallen) closes apache/metron#740

commit 545f358a11c91c40807855024d0169d59561c83d
Author: merrimanr <merrim...@gmail.com>
Date:   2017-09-11T16:16:38Z

    METRON-1114 Add group by capabilities to search REST endpoint (merrimanr) 
closes apache/metron#702

commit 95db8b40e76d07aa4344d7b05f0f0c14ed24f59f
Author: ottobackwards <ottobackwa...@gmail.com>
Date:   2017-09-12T15:04:07Z

    METRON-1176 REST: HDFS Service should support setting permissions on files 
when writing (ottobackwards) closes apache/metron#749

commit 309d3757df50a2dda0ac4396750e292e76926c5d
Author: Anand Subramanian <anandsu...@gmail.com>
Date:   2017-09-12T16:27:09Z

    METRON-1146: Add ability to parse JSON string into JSONObject for stellar 
closes apache/incubator-metron#727

commit 7acadb128ececfee1bc9df8242daecf91befcd90
Author: Otto Fowler <ottobackwa...@gmail.com>
Date:   2017-09-12T16:45:50Z

    Merge remote-tracking branch 'apache/master' into ext-master-9-12

commit 58561a9131f6c12a9400f5588b91df3320d996a2
Author: Otto Fowler <ottobackwa...@gmail.com>
Date:   2017-09-13T01:04:31Z

    fixes post merge

commit e0fa7f0841ebbfdf81c9f5bf0489be43c877cf81
Author: Otto Fowler <ottobackwa...@gmail.com>
Date:   2017-09-13T01:04:50Z

    Merge remote-tracking branch 'apache/master' into ext-master-9-12

----


---

Reply via email to