You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/04/27 20:20:13 UTC
[26/50] [abbrv] ambari git commit: Merge branch 'trunk' into
branch-dev-patch-upgrade
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/393ab3ee
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/393ab3ee
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/393ab3ee
Branch: refs/heads/trunk
Commit: 393ab3ee28a27c63084ee4700bf0386b6ceb4a9b
Parents: 535327d d6d2479
Author: Nate Cole <nc...@hortonworks.com>
Authored: Mon Jan 30 10:40:13 2017 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Mon Jan 30 10:40:13 2017 -0500
----------------------------------------------------------------------
.../src/main/python/ambari_agent/ActionQueue.py | 28 ++--
.../libraries/functions/solr_cloud_util.py | 6 +-
.../ambari-logsearch-portal/pom.xml | 5 +
.../org/apache/ambari/logsearch/LogSearch.java | 98 +-----------
.../apache/ambari/logsearch/util/FileUtil.java | 26 ++++
.../apache/ambari/logsearch/util/SSLUtil.java | 141 ++++++++++++++----
.../logsearch/solr/AmbariSolrCloudCLI.java | 13 +-
.../logsearch/solr/AmbariSolrCloudClient.java | 6 +
.../solr/AmbariSolrCloudClientBuilder.java | 6 +
.../EnableKerberosPluginSolrZkCommand.java | 25 +++-
.../AmbariCustomCommandExecutionHelper.java | 16 ++
.../server/hooks/users/UserHookParams.java | 3 +-
.../server/hooks/users/UserHookService.java | 23 ++-
.../orm/entities/ServiceConfigEntity.java | 2 +-
.../AmbariAuthToLocalUserDetailsService.java | 17 ++-
.../users/CsvFilePersisterService.java | 6 +-
.../users/PostUserCreationHookServerAction.java | 8 +-
ambari-server/src/main/python/bootstrap.py | 3 +-
.../configuration/infra-solr-security-json.xml | 36 +++++
.../AMBARI_INFRA/0.1.0/metainfo.xml | 1 +
.../0.1.0/package/scripts/params.py | 2 +
.../0.1.0/package/scripts/setup_infra_solr.py | 12 +-
.../properties/infra-solr-security.json.j2 | 22 +++
.../2.1.0.2.0/package/scripts/hdfs_namenode.py | 4 +
.../HDFS/2.1.0.2.0/package/scripts/utils.py | 14 +-
.../2.1.0.2.0/package/scripts/zkfc_slave.py | 5 -
.../3.0.0.3.0/package/scripts/hdfs_namenode.py | 4 +
.../HDFS/3.0.0.3.0/package/scripts/utils.py | 42 +++---
.../3.0.0.3.0/package/scripts/zkfc_slave.py | 7 -
.../package/scripts/hive_interactive.py | 4 +-
.../package/scripts/hive_server_interactive.py | 6 +-
.../0.12.0.2.0/package/scripts/params_linux.py | 12 +-
.../scripts/post-user-creation-hook.sh | 9 +-
.../2.0.6/hooks/before-ANY/scripts/params.py | 16 +-
.../stacks/HDP/2.0.6/services/stack_advisor.py | 12 ++
.../stacks/HDP/2.3/upgrades/config-upgrade.xml | 20 +++
.../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 12 ++
.../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 12 ++
.../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 12 ++
.../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 11 ++
.../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 11 ++
.../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 11 ++
.../stacks/HDP/2.4/upgrades/config-upgrade.xml | 20 +++
.../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 14 ++
.../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 12 ++
.../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 11 ++
.../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 11 ++
.../services/HIVE/configuration/hive-log4j2.xml | 25 +++-
.../HIVE/configuration/llap-cli-log4j2.xml | 25 +++-
.../stacks/HDP/2.5/services/stack_advisor.py | 12 ++
.../stacks/HDP/2.5/upgrades/config-upgrade.xml | 28 ++++
.../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 14 +-
.../stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 6 +
.../stacks/HDP/2.6/services/SPARK2/metainfo.xml | 5 +-
.../HDP/3.0/hooks/before-ANY/scripts/params.py | 19 ++-
.../FAKEHDFS/package/scripts/zkfc_slave.py | 5 +
.../PERF/1.0/services/FAKEYARN/metainfo.xml | 4 +-
.../src/main/resources/stacks/stack_advisor.py | 38 ++++-
.../server/hooks/users/UserHookServiceTest.java | 9 ++
.../server/orm/dao/ServiceConfigDAOTest.java | 66 +++++++--
.../UpdateKerberosConfigsServerActionTest.java | 14 +-
.../PostUserCreationHookServerActionTest.java | 3 +-
.../stacks/2.0.6/common/test_stack_advisor.py | 148 +++++++++++++++++++
.../stacks/2.4/AMBARI_INFRA/test_infra_solr.py | 7 +
.../test/python/stacks/2.4/configs/default.json | 3 +
.../stacks/2.5/HIVE/test_hive_server_int.py | 8 +-
.../2.5/common/services-normal-his-2-hosts.json | 8 +-
.../2.5/common/services-normal-his-valid.json | 8 +-
.../stacks/2.5/common/test_stack_advisor.py | 18 ++-
ambari-web/app/styles/modal_popups.less | 42 +++++-
.../views/common/modal_popups/log_tail_popup.js | 2 +-
.../admin/stack_upgrade/upgrade_history_view.js | 2 +-
.../src/main/resources/ui/app/models/queue.js | 3 +
.../view/hive2/actor/ResultSetIterator.java | 3 +-
.../view/hive20/actor/ResultSetIterator.java | 3 +-
.../hive20/src/main/resources/ui/app/app.js | 9 ++
.../components/multiple-database-search-bar.js | 31 +++-
.../resources/ui/app/controllers/queries.js | 22 +++
.../main/resources/ui/app/models/worksheet.js | 5 +-
.../hive20/src/main/resources/ui/app/router.js | 2 +
.../main/resources/ui/app/routes/application.js | 4 +-
.../ui/app/routes/databases/newtable.js | 30 ++++
.../src/main/resources/ui/app/routes/index.js | 26 ++++
.../src/main/resources/ui/app/routes/queries.js | 49 +-----
.../resources/ui/app/routes/queries/index.js | 9 +-
.../main/resources/ui/app/routes/queries/new.js | 38 +++++
.../resources/ui/app/routes/queries/query.js | 29 ++--
.../src/main/resources/ui/app/services/jobs.js | 10 +-
.../src/main/resources/ui/app/styles/app.scss | 4 +
.../components/multiple-database-search-bar.hbs | 11 +-
.../components/top-application-bar.hbs | 4 +-
.../ui/app/templates/queries/query.hbs | 4 +-
.../src/main/resources/ui/config/environment.js | 2 +
.../ui/app/components/bundle-config.js | 2 +-
.../ui/app/components/flow-designer.js | 5 +-
.../ui/app/components/workflow-action-editor.js | 2 +-
.../ui/app/domain/actionjob_hanlder.js | 1 +
.../app/domain/bundle/bundle-xml-generator.js | 4 +-
.../ui/app/domain/bundle/bundle-xml-importer.js | 6 +-
.../app/templates/components/flow-designer.hbs | 8 +-
.../ui/app/templates/components/sla-info.hbs | 6 +-
.../app/templates/components/sqoop-action.hbs | 2 +-
.../templates/components/workflow-actions.hbs | 2 +-
103 files changed, 1277 insertions(+), 375 deletions(-)
----------------------------------------------------------------------