Merge branch 'trunk' into branch-feature-AMBARI-18634
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1f4221cf Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1f4221cf Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1f4221cf Branch: refs/heads/branch-dev-patch-upgrade Commit: 1f4221cf71e2a2c216ad1017fd5d6a28d99dbc6a Parents: f9814d2 0bdaff8 Author: Nate Cole <[email protected]> Authored: Fri Nov 4 09:26:37 2016 -0400 Committer: Nate Cole <[email protected]> Committed: Fri Nov 4 09:26:37 2016 -0400 ---------------------------------------------------------------------- .../ambari/server/checks/CheckDescription.java | 4 +- .../orm/entities/RepositoryVersionEntity.java | 39 +++---- .../ambari/server/stack/ServiceModule.java | 15 ++- .../org/apache/ambari/server/state/StackId.java | 4 - .../ambari/server/topology/AmbariContext.java | 3 +- .../ambari/server/topology/Blueprint.java | 9 ++ .../ambari/server/topology/BlueprintImpl.java | 49 +++++++++ .../apache/ambari/server/topology/Setting.java | 21 ++++ .../2.1.0.2.0/package/scripts/hdfs_namenode.py | 2 +- .../1.4.4.2.0/package/scripts/params_linux.py | 2 +- ...leRepositoryVersionResourceProviderTest.java | 4 + .../RepositoryVersionResourceProviderTest.java | 14 +++ .../orm/dao/RepositoryVersionDAOTest.java | 35 +++++++ .../server/stack/StackManagerExtensionTest.java | 9 ++ .../server/topology/AmbariContextTest.java | 1 + .../EXT/0.1/services/OOZIE2/metainfo.xml | 8 ++ .../services/OOZIE2/themes/working_theme.json | 5 + .../EXT/0.2/services/OOZIE2/metainfo.xml | 8 ++ .../services/OOZIE2/themes/broken_theme.json | 3 + ambari-web/app/mappers/stack_service_mapper.js | 6 +- ambari-web/app/messages.js | 2 +- ambari-web/app/models/stack_service.js | 4 +- ambari-web/app/styles/application.less | 12 +-- .../templates/common/configs/service_config.hbs | 16 +-- ambari-web/app/templates/main/host/summary.hbs | 2 +- ambari-web/app/utils/validator.js | 3 +- ambari-web/app/views.js | 1 + .../configs/config_category_container_view.js | 64 ++++++++++++ .../configs/service_configs_by_category_view.js | 42 ++++---- .../common/helpers/format_word_break_view.js | 8 +- ambari-web/test/models/stack_service_test.js | 2 + ambari-web/test/utils/validator_test.js | 22 ++++ .../notification_configs_view_test.js | 6 +- .../helpers/format_word_break_view_test.js | 24 +++-- .../apache/ambari/view/hive2/AuthParams.java | 102 +++++++++++++++++++ .../ambari/view/hive2/actor/JdbcConnector.java | 30 +++++- .../view/hive2/actor/message/Connect.java | 5 +- .../hive2/internal/HiveConnectionWrapper.java | 43 ++++++-- .../resources/browser/ConnectionService.java | 4 +- .../view/hive2/ConnectionFailuresTest.java | 9 +- .../ambari/view/hive2/JobExecutionTest.java | 6 +- 41 files changed, 525 insertions(+), 123 deletions(-) ----------------------------------------------------------------------
