You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2014/09/03 13:38:34 UTC
[6/6] git commit: Merge branch 'trunk' into branch-alerts-dev
Merge branch 'trunk' into branch-alerts-dev
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/03a5be1e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/03a5be1e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/03a5be1e
Branch: refs/heads/branch-alerts-dev
Commit: 03a5be1e193d6ade127fe38cd56d63688b9d5598
Parents: 8697c91 ca2106f
Author: Nate Cole <nc...@hortonworks.com>
Authored: Wed Sep 3 07:38:07 2014 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Wed Sep 3 07:38:07 2014 -0400
----------------------------------------------------------------------
.../controllers/ambariViews/ViewsEditCtrl.js | 1 +
.../clusters/ClustersManageAccessCtrl.js | 1 +
.../controllers/groups/GroupsListCtrl.js | 2 +-
.../scripts/controllers/users/UsersListCtrl.js | 2 +-
.../scripts/controllers/users/UsersShowCtrl.js | 2 +-
.../admin-web/app/views/ambariViews/create.html | 2 +-
.../admin-web/app/views/ambariViews/edit.html | 4 +-
.../app/views/clusters/manageAccess.html | 4 +-
.../ui/admin-web/app/views/groups/list.html | 9 ----
.../ui/admin-web/app/views/users/show.html | 2 +-
.../main/resources/ui/admin-web/package.json | 2 +-
.../stacks/HDP/2.0.6/services/YARN/metainfo.xml | 2 +-
.../stacks/HDP/2.1/services/YARN/metainfo.xml | 1 +
ambari-web/app/app.js | 15 +++---
.../app/controllers/global/update_controller.js | 3 +-
.../main/admin/serviceAccounts_controller.js | 17 ++++--
.../controllers/main/service/info/configs.js | 7 +--
ambari-web/app/data/secure_properties.js | 1 +
ambari-web/app/models/service_config.js | 9 +++-
ambari-web/app/views/main/service/item.js | 2 +-
ambari-web/test/app_test.js | 55 --------------------
.../admin/serviceAccounts_controller_test.js | 24 ---------
22 files changed, 49 insertions(+), 118 deletions(-)
----------------------------------------------------------------------