You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2014/07/16 17:34:27 UTC
[2/2] git commit: Merge remote-tracking branch 'origin/trunk' into
trunk
Merge remote-tracking branch 'origin/trunk' into trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7c97da6e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7c97da6e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7c97da6e
Branch: refs/heads/trunk
Commit: 7c97da6e5e58bbcd9bd2530bc9b1c60b67687267
Parents: fd15d4c 74fac8a
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Wed Jul 16 18:34:23 2014 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Wed Jul 16 18:34:23 2014 +0300
----------------------------------------------------------------------
.../server/upgrade/AbstractUpgradeCatalog.java | 51 ++++++++------
.../server/upgrade/UpgradeCatalogTest.java | 2 +-
.../global/configuration_controller.js | 51 +++++++++-----
.../main/admin/highAvailability_controller.js | 12 ++--
.../controllers/main/admin/misc_controller.js | 24 ++++---
.../app/controllers/main/admin/security.js | 9 +--
.../controllers/main/mirroring_controller.js | 7 +-
.../controllers/main/service/info/configs.js | 40 ++++++-----
.../main/service/reassign_controller.js | 20 +++---
.../app/controllers/wizard/step7_controller.js | 73 ++++++++++----------
ambari-web/app/messages.js | 4 ++
ambari-web/app/models/service_config.js | 5 +-
.../highAvailability/resourceManager/step1.hbs | 4 ++
ambari-web/app/utils/ajax/ajax.js | 7 +-
ambari-web/app/utils/config.js | 18 +----
.../app/views/common/quick_view_link_view.js | 10 +--
16 files changed, 186 insertions(+), 151 deletions(-)
----------------------------------------------------------------------