Merge remote-tracking branch 'origin/trunk' into origin-trunk
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/940abdc4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/940abdc4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/940abdc4 Branch: refs/heads/branch-alerts-dev Commit: 940abdc4a232c1c354ec3eff17abed89c224c161 Parents: 5e3c95f eb08925 Author: Oleg Nechiporenko <[email protected]> Authored: Wed Aug 27 17:41:40 2014 +0300 Committer: Oleg Nechiporenko <[email protected]> Committed: Wed Aug 27 17:41:40 2014 +0300 ---------------------------------------------------------------------- .../ui/app/components/configSection.js | 48 ++++++++++++++++++++ .../createAppWizard/step3_controller.js | 45 ++++++++++++++---- .../src/main/resources/ui/app/helpers/helper.js | 5 +- .../app/templates/components/configSection.hbs | 30 ++++++++++++ .../ui/app/templates/createAppWizard/step3.hbs | 4 +- 5 files changed, 122 insertions(+), 10 deletions(-) ----------------------------------------------------------------------
