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 2017/07/11 17:12:35 UTC
[3/3] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-20859
Merge branch 'trunk' into branch-feature-AMBARI-20859
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/70971091
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/70971091
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/70971091
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: 709710915c93266f295fe9630e29480ff4648857
Parents: ca8e9ee 0b397cd
Author: Robert Levas <rl...@hortonworks.com>
Authored: Tue Jul 11 13:12:26 2017 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Tue Jul 11 13:12:26 2017 -0400
----------------------------------------------------------------------
.../libraries/functions/conf_select.py | 56 +++++---------------
.../2.0.6/HBASE/test_phoenix_queryserver.py | 23 --------
.../stacks/2.0.6/YARN/test_historyserver.py | 21 +-------
ambari-web/app/controllers/main/service.js | 13 ++++-
ambari-web/app/utils/ajax/ajax.js | 22 ++++++++
.../test/controllers/main/service_test.js | 4 +-
6 files changed, 51 insertions(+), 88 deletions(-)
----------------------------------------------------------------------