Merge branch 'trunk' into branch-dev-patch-upgrade
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b1bb2890 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b1bb2890 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b1bb2890 Branch: refs/heads/branch-dev-patch-upgrade Commit: b1bb2890aa3bc0e6ad67375808e8b4028a74bedc Parents: 608f0b5 1527bd1 Author: Nate Cole <[email protected]> Authored: Thu Jan 5 08:38:22 2017 -0500 Committer: Nate Cole <[email protected]> Committed: Thu Jan 5 08:38:22 2017 -0500 ---------------------------------------------------------------------- .../controllers/clusters/UserAccessListCtrl.js | 7 +- .../app/views/clusters/userAccessList.html | 2 +- .../test/unit/services/PermissionSaver_test.js | 5 + .../metrics/timeline/PhoenixHBaseAccessor.java | 7 +- .../configuration/logsearch-properties.xml | 7 + .../LOGSEARCH/0.5.0/package/scripts/params.py | 1 - .../0.6.0.2.5/package/scripts/master.py | 8 + .../stacks/2.4/LOGSEARCH/test_logsearch.py | 2 +- .../test/python/stacks/2.4/configs/default.json | 3 +- ambari-web/app/controllers/main/host/details.js | 94 +++++---- .../configs/services/logsearch_properties.js | 21 +- ambari-web/app/utils/config.js | 42 +++- .../configs/add_component_config_initializer.js | 5 +- .../configs/hosts_based_initializer_mixin.js | 2 +- .../test/controllers/main/host/details_test.js | 12 +- ambari-web/test/utils/config_test.js | 147 ++++++++++++- .../scripts/models/MigrationResponse.java | 6 +- contrib/views/wfmanager/.gitignore | 20 ++ .../ui/app/components/bundle-config.js | 11 +- .../app/components/bundle-version-settings.js | 12 +- .../resources/ui/app/components/coord-config.js | 12 +- .../ui/app/components/coord-version-settings.js | 12 +- .../ui/app/components/flow-designer.js | 46 ++-- .../resources/ui/app/components/fs-action.js | 3 + .../resources/ui/app/components/hdfs-browser.js | 5 +- .../main/resources/ui/app/components/save-wf.js | 13 +- .../ui/app/components/version-settings.js | 28 +-- .../ui/app/domain/actionjob_hanlder.js | 2 +- .../ui/app/domain/bundle/bundle-xml-importer.js | 18 +- .../coordinator/coordinator-xml-importer.js | 17 +- .../resources/ui/app/domain/schema-versions.js | 208 ++++++++----------- .../ui/app/domain/workflow-importer.js | 27 ++- .../ui/app/domain/workflow-json-importer.js | 2 + .../ui/app/domain/workflow-xml-generator.js | 2 +- .../main/resources/ui/app/domain/workflow.js | 12 +- .../src/main/resources/ui/app/routes/design.js | 42 ++++ .../src/main/resources/ui/app/styles/app.less | 9 + .../app/templates/components/bundle-config.hbs | 2 +- .../components/bundle-version-settings.hbs | 4 +- .../app/templates/components/coord-config.hbs | 2 +- .../components/coord-version-settings.hbs | 4 +- .../templates/components/designer-errors.hbs | 2 +- .../app/templates/components/flow-designer.hbs | 10 +- .../app/templates/components/hdfs-browser.hbs | 6 +- .../templates/components/version-settings.hbs | 4 +- .../main/resources/ui/app/templates/design.hbs | 3 +- 46 files changed, 589 insertions(+), 320 deletions(-) ----------------------------------------------------------------------
