[ambari] branch trunk updated (8a740f2 -> f3ee18e)

[al...@apache.org]

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

alexantonenko pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git.


    from 8a740f2  AMBARI-24431. Infra Manager / Log Search: Fix Jetty CVE-2018-12536. (#2002)
     add 853ac14  AMBARI-24412. Unit tests for federation step 4 controller
     new f3ee18e  Merge pull request #1982 from hiveww/AMBARI-24412-trunk

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ambari-web/app/assets/test/tests.js                |   1 +
 .../main/admin/federation/step4_controller_test.js | 259 +++++++++++++++++++++
 2 files changed, 260 insertions(+)
 create mode 100644 ambari-web/test/controllers/main/admin/federation/step4_controller_test.js

[ambari] 01/01: Merge pull request #1982 from hiveww/AMBARI-24412-trunk

[al...@apache.org]

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

alexantonenko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit f3ee18e32276f7d4c9d196741b975ad501e3d1b8
Merge: 8a740f2 853ac14
Author: Alexander Antonenko <hi...@gmail.com>
AuthorDate: Thu Aug 9 10:01:45 2018 +0300

    Merge pull request #1982 from hiveww/AMBARI-24412-trunk
    
    AMBARI-24412. Unit tests for federation step 4 controller

 ambari-web/app/assets/test/tests.js                |   1 +
 .../main/admin/federation/step4_controller_test.js | 259 +++++++++++++++++++++
 2 files changed, 260 insertions(+)