Merge branch 'trunk' into branch-feature-AMBARI-12556
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2cfc8d22 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2cfc8d22 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2cfc8d22 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: 2cfc8d22dc1ccc180c376b40ea6a96967d9bf6a4 Parents: 560b0d1 90abffd Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Wed May 24 09:57:57 2017 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Wed May 24 09:57:57 2017 -0400 ---------------------------------------------------------------------- .../server/state/ValueAttributesInfo.java | 26 +-- .../app/controllers/wizard/step8_controller.js | 158 ++++++++++++++----- .../test/controllers/wizard/step8_test.js | 77 ++++++--- pom.xml | 1 + 4 files changed, 192 insertions(+), 70 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2cfc8d22/ambari-web/app/controllers/wizard/step8_controller.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2cfc8d22/ambari-web/test/controllers/wizard/step8_test.js ----------------------------------------------------------------------