You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@metron.apache.org by ni...@apache.org on 2019/09/13 15:33:50 UTC

[metron] 01/01: Merge remote-tracking branch 'apache/master' into feature/METRON-2088-support-hdp-3.1

This is an automated email from the ASF dual-hosted git repository.

nickallen pushed a commit to branch feature/METRON-2088-support-hdp-3.1
in repository https://gitbox.apache.org/repos/asf/metron.git

commit eeccdc4f6d96ec3c3d19880e88b79278578d5963
Merge: 802cbdd b1536d7
Author: Nick Allen <ni...@nickallen.org>
AuthorDate: Fri Sep 13 11:32:56 2019 -0400

    Merge remote-tracking branch 'apache/master' into feature/METRON-2088-support-hdp-3.1

 .../alerts-list/table-view/table-view.component.ts | 13 +++-
 .../alerts-list/tree-view/tree-view.component.ts   |  6 +-
 .../configure-rows/configure-rows.component.html   |  3 +
 .../configure-rows.component.spec.ts               |  2 +
 .../alerts/configure-rows/configure-rows.module.ts |  8 ++-
 .../timezone-config.component.spec.ts              | 76 ++++++++++++++++++++++
 .../timezone-config.component.ts}                  | 32 ++++-----
 .../timezone-config.service.spec.ts                | 55 ++++++++++++++++
 .../timezone-config.service.ts}                    | 34 ++++++----
 .../functions/RestFunctionsIntegrationTest.java    | 18 +++--
 10 files changed, 206 insertions(+), 41 deletions(-)