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

Posted to commits@ambari.apache.org by rl...@apache.org on 2018/01/15 16:55:09 UTC

[ambari] 01/01: Merge pull request #120 from rlevas/branch-feature-AMBARI-20859

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

rlevas pushed a commit to branch branch-feature-AMBARI-20859
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 473df03dd38d00af6b129c266959bc65595dc274
Merge: 6737bba f6d569b
Author: Robert Levas <rl...@users.noreply.github.com>
AuthorDate: Mon Jan 15 11:55:06 2018 -0500

    Merge pull request #120 from rlevas/branch-feature-AMBARI-20859
    
    Merge branch 'trunk' into branch-feature-AMBARI-20859

 .../YARN/2.1.0.2.0/package/scripts/yarn.py         |   4 +-
 .../YARN/3.0.0.3.0/package/scripts/yarn.py         |   4 +-
 .../controller/RootServiceResponseFactoryTest.java | 145 ++++++++++-----------
 ambari-web/app/styles/application.less             |   8 ++
 ambari-web/app/templates/application.hbs           | 129 ++++++++++--------
 .../ODPi/2.0/services/YARN/package/scripts/yarn.py |   4 +-
 6 files changed, 155 insertions(+), 139 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
"commits@ambari.apache.org" <co...@ambari.apache.org>.