ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [22/22] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-12556
Date Wed, 10 May 2017 13:37:45 GMT
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/8938ea21
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8938ea21
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8938ea21

Branch: refs/heads/branch-feature-AMBARI-12556
Commit: 8938ea219436d78c31934faeeb2c03bdd9f6f415
Parents: b1f704d 80ef772
Author: Jonathan Hurley <jhurley@hortonworks.com>
Authored: Wed May 10 09:36:26 2017 -0400
Committer: Jonathan Hurley <jhurley@hortonworks.com>
Committed: Wed May 10 09:36:26 2017 -0400

----------------------------------------------------------------------
 ambari-agent/conf/unix/install-helper.sh        |   2 +-
 .../main/python/ambari_agent/AmbariConfig.py    |  67 +-
 .../ambari_agent/CustomServiceOrchestrator.py   |   3 +-
 .../src/main/python/ambari_agent/NetUtil.py     |   5 +-
 .../python/ambari_agent/alerts/web_alert.py     |   5 +-
 .../main/python/ambari_commons/inet_utils.py    |  43 +-
 .../libraries/functions/curl_krb_request.py     |  17 +-
 .../libraries/script/script.py                  |  18 +-
 ambari-logsearch/README.md                      |   8 +-
 ambari-logsearch/ambari-logsearch-it/pom.xml    | 173 +++-
 .../logsearch/domain/StoryDataRegistry.java     |  10 +
 .../logsearch/steps/AbstractLogSearchSteps.java | 162 ++++
 .../logsearch/steps/LogSearchDockerSteps.java   | 116 +--
 .../logsearch/steps/LogSearchUISteps.java       | 212 +++++
 .../logsearch/story/LogSearchApiQueryStory.java |  22 -
 .../story/LogSearchBackendStories.java          |  84 ++
 .../ambari/logsearch/story/LogSearchStory.java  |  60 --
 .../logsearch/story/LogSearchUIStories.java     |  93 ++
 .../logsearch/story/LogfeederParsingStory.java  |  22 -
 .../ambari/logsearch/web/AbstractPage.java      |  63 ++
 .../org/apache/ambari/logsearch/web/Home.java   |  39 +
 .../story/log_search_api_query_story.story      |  17 -
 .../story/logfeeder_parsing_story.story         |  20 -
 .../backend/log_search_api_query_story.story    |  17 +
 .../backend/logfeeder_parsing_story.story       |  20 +
 .../resources/stories/selenium/login.ui.story   |  20 +
 ambari-logsearch/docker/Dockerfile              |  17 +-
 ambari-logsearch/docker/bin/start.sh            |   8 +
 ambari-logsearch/docker/logsearch-docker.sh     |  10 +-
 ambari-server/conf/unix/install-helper.sh       |   2 +-
 .../AmbariManagementControllerImpl.java         |  67 +-
 .../controller/AmbariManagementHelper.java      | 175 ++++
 .../ambari/server/orm/dao/ExtensionLinkDAO.java |  36 +-
 .../orm/entities/ExtensionLinkEntity.java       |   1 +
 .../server/orm/entities/PrivilegeEntity.java    |  10 +
 .../ambari/server/orm/entities/ViewEntity.java  |   9 +
 .../server/orm/entities/ViewInstanceEntity.java |   9 +
 .../ambari/server/stack/ExtensionModule.java    |   2 +
 .../stack/QuickLinksConfigurationModule.java    |   2 +-
 .../ambari/server/stack/StackManager.java       |  79 +-
 .../apache/ambari/server/stack/StackModule.java |   4 +-
 .../apache/ambari/server/stack/ThemeModule.java |   2 +-
 .../ambari/server/state/ExtensionInfo.java      |  26 +-
 .../apache/ambari/server/state/StackInfo.java   |  27 +-
 .../state/stack/ExtensionMetainfoXml.java       |  11 +
 .../server/upgrade/UpgradeCatalog250.java       |  28 +-
 .../view/ViewInstanceOperationHandler.java      |  96 +++
 .../apache/ambari/server/view/ViewRegistry.java |  55 +-
 .../python/ambari_server/resourceFilesKeeper.py |  11 +-
 .../main/python/ambari_server/setupMpacks.py    |  39 +-
 .../common-services/ATLAS/0.7.0.3.0/alerts.json |  39 +
 .../configuration/application-properties.xml    | 546 ++++++++++++
 .../ATLAS/0.7.0.3.0/configuration/atlas-env.xml | 182 ++++
 .../0.7.0.3.0/configuration/atlas-log4j.xml     | 170 ++++
 .../configuration/atlas-solrconfig.xml          | 641 ++++++++++++++
 .../configuration/ranger-atlas-audit.xml        | 141 ++++
 .../ranger-atlas-plugin-properties.xml          | 132 +++
 .../ranger-atlas-policymgr-ssl.xml              |  73 ++
 .../configuration/ranger-atlas-security.xml     |  77 ++
 .../ATLAS/0.7.0.3.0/kerberos.json               | 100 +++
 .../ATLAS/0.7.0.3.0/metainfo.xml                | 190 +++++
 .../0.7.0.3.0/package/scripts/atlas_client.py   |  57 ++
 .../ATLAS/0.7.0.3.0/package/scripts/metadata.py | 243 ++++++
 .../package/scripts/metadata_server.py          | 187 ++++
 .../ATLAS/0.7.0.3.0/package/scripts/params.py   | 417 +++++++++
 .../0.7.0.3.0/package/scripts/service_check.py  |  55 ++
 .../package/scripts/setup_ranger_atlas.py       |  70 ++
 .../0.7.0.3.0/package/scripts/status_params.py  |  60 ++
 .../package/templates/atlas_hbase_setup.rb.j2   |  42 +
 .../package/templates/atlas_jaas.conf.j2        |  26 +
 .../package/templates/atlas_kafka_acl.sh.j2     |  41 +
 .../templates/input.config-atlas.json.j2        |  48 ++
 .../package/templates/kafka_jaas.conf.j2        |  41 +
 .../ATLAS/0.7.0.3.0/quicklinks/quicklinks.json  |  36 +
 .../ATLAS/0.7.0.3.0/role_command_order.json     |   7 +
 .../ATLAS/0.7.0.3.0/service_advisor.py          | 441 ++++++++++
 .../ATLAS/0.7.0.3.0/themes/theme.json           | 619 ++++++++++++++
 .../ATLAS/0.7.0.3.0/themes/theme_version_2.json | 845 +++++++++++++++++++
 .../HDFS/2.1.0.2.0/package/scripts/utils.py     |   5 +-
 .../package/alerts/alert_llap_app_status.py     |   4 +-
 .../package/scripts/hive_server_interactive.py  |   7 +-
 .../0.8.1/package/scripts/service_check.py      |  15 +-
 .../KAFKA/0.9.0/configuration/kafka-broker.xml  |   2 +-
 .../HDP/2.0.6/properties/stack_features.json    |  10 +
 .../stacks/HDP/3.0/services/ATLAS/metainfo.xml  |  27 +
 .../QuickLinksConfigurationModuleTest.java      |  10 +
 .../stack/StackManagerCommonServicesTest.java   |   4 +-
 .../server/stack/StackManagerExtensionTest.java |  73 +-
 .../server/stack/StackManagerMiscTest.java      |  13 +-
 .../ambari/server/stack/StackManagerMock.java   |   5 +-
 .../ambari/server/stack/StackManagerTest.java   |  13 +-
 .../ambari/server/stack/ThemeModuleTest.java    |  12 +-
 .../server/upgrade/UpgradeCatalog250Test.java   |   4 +-
 .../view/ViewInstanceOperationHandlerTest.java  | 105 +++
 .../ambari/server/view/ViewRegistryTest.java    |  38 +-
 ambari-server/src/test/python/TestMpacks.py     |  17 +-
 .../src/test/python/TestResourceFilesKeeper.py  |  29 +-
 .../resources/extensions/EXT/0.1/metainfo.xml   |   2 +-
 .../resources/extensions/EXT/0.2/metainfo.xml   |   3 +-
 .../resources/extensions/EXT/0.3/metainfo.xml   |  32 +
 .../EXT/0.3/services/OOZIE2/metainfo.xml        | 118 +++
 .../services/OOZIE2/themes/broken_theme.json    |   3 +
 .../stacks_with_extensions/HDP/0.3/metainfo.xml |  22 +
 .../HDP/0.3/repos/repoinfo.xml                  |  63 ++
 .../HDP/0.3/services/HBASE/metainfo.xml         |  26 +
 .../0.3/services/HDFS/configuration/global.xml  | 145 ++++
 .../services/HDFS/configuration/hadoop-env.xml  | 223 +++++
 .../services/HDFS/configuration/hbase-site.xml  | 137 +++
 .../services/HDFS/configuration/hdfs-log4j.xml  | 199 +++++
 .../services/HDFS/configuration/hdfs-site.xml   | 396 +++++++++
 .../HDP/0.3/services/HDFS/metainfo.xml          |  30 +
 .../0.3/services/HDFS/package/dummy-script.py   |  20 +
 .../HDP/0.3/services/HIVE/metainfo.xml          |  26 +
 .../HDP/0.3/services/MAPREDUCE/metainfo.xml     |  23 +
 .../HDP/0.3/services/ZOOKEEPER/metainfo.xml     |  26 +
 .../global/background_operations_controller.js  |  12 +-
 ambari-web/app/utils/ajax/ajax.js               |   4 +-
 ambari-web/app/views/main/service/item.js       |   6 +-
 .../global/background_operations_test.js        | 179 +---
 .../view/hive2/resources/jobs/JobService.java   |   9 +-
 .../ui/hive-web/app/controllers/index.js        |   2 +-
 .../view/hive20/resources/jobs/JobService.java  |  16 +-
 .../src/main/resources/ui/app/adapters/job.js   |   2 +-
 .../ui/app/utils/hive-explainer/processor.js    |  12 +-
 .../ui/app/utils/hive-explainer/renderer.js     |  18 +-
 .../ui/app/utils/hive-explainer/transformer.js  |  11 +-
 126 files changed, 8944 insertions(+), 784 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8938ea21/ambari-common/src/main/python/resource_management/libraries/script/script.py
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/8938ea21/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
diff --cc ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index ab9b879,f9375aa..882f583
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@@ -118,7 -119,7 +118,6 @@@ import org.apache.ambari.server.orm.dao
  import org.apache.ambari.server.orm.dao.WidgetDAO;
  import org.apache.ambari.server.orm.dao.WidgetLayoutDAO;
  import org.apache.ambari.server.orm.entities.ClusterEntity;
- import org.apache.ambari.server.orm.entities.ExtensionEntity;
 -import org.apache.ambari.server.orm.entities.ClusterVersionEntity;
  import org.apache.ambari.server.orm.entities.ExtensionLinkEntity;
  import org.apache.ambari.server.orm.entities.HostEntity;
  import org.apache.ambari.server.orm.entities.OperatingSystemEntity;


Mime
View raw message