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:15 UTC

[28/50] [abbrv] ambari git commit: Merge branch 'trunk' into branch-feature-AMBARI-12556

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/341cb124
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/341cb124
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/341cb124

Branch: refs/heads/trunk
Commit: 341cb1247cbf67f5611766d8f5bf27bd878441e1
Parents: d222f57 7cb9a6a
Author: Nate Cole <nc...@hortonworks.com>
Authored: Mon Feb 13 17:11:38 2017 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Mon Feb 13 17:11:38 2017 -0500

----------------------------------------------------------------------
 .../controllers/clusters/UserAccessListCtrl.js  |    5 +-
 .../clusters/UserAccessListCtrl_test.js         |   90 -
 ambari-agent/conf/unix/ambari-agent             |    7 +-
 ambari-agent/pom.xml                            |    3 +
 .../ambari_agent/CustomServiceOrchestrator.py   |   27 +-
 .../TestCustomServiceOrchestrator.py            |   18 +
 .../python/ambari_agent/TestProcessUtils.py     |  224 ++
 .../src/test/python/ambari_agent/TestShell.py   |    5 +-
 .../resource_management/TestContentSources.py   |   11 +-
 .../ambari_commons/credential_store_helper.py   |   45 +
 .../src/main/python/ambari_commons/firewall.py  |    3 +
 .../src/main/python/ambari_commons/network.py   |   39 +
 .../main/python/ambari_commons/process_utils.py |  100 +
 .../src/main/python/ambari_commons/shell.py     |   54 +-
 .../python/resource_management/core/logger.py   |    4 +
 .../python/resource_management/core/shell.py    |    6 +-
 .../python/resource_management/core/source.py   |    8 +-
 .../functions/get_not_managed_resources.py      |   19 +-
 .../HDP/2.1.1/services/STORM/metrics.json       |   10 +-
 .../ambari-infra-solr-plugin/pom.xml            |   56 +
 .../InfraKerberosHostValidator.java             |   54 +
 .../InfraRuleBasedAuthorizationPlugin.java      |  542 +++
 .../InfraUserRolesLookupStrategy.java           |   49 +
 .../InfraKerberosHostValidatorTest.java         |  114 +
 .../InfraRuleBasedAuthorizationPluginTest.java  |  247 ++
 .../InfraUserRolesLookupStrategyTest.java       |   83 +
 .../ambari-logsearch-assembly/pom.xml           |   15 +-
 .../logsearch/common/LogSearchConstants.java    |    1 -
 .../UserConfigRequestQueryConverter.java        |   17 +-
 .../ambari/logsearch/doc/DocConstants.java      |    3 -
 .../logsearch/manager/UserConfigManager.java    |   53 +-
 .../request/UserConfigParamDefinition.java      |    6 -
 .../model/request/impl/UserConfigRequest.java   |   15 +-
 .../model/response/UserConfigData.java          |   11 -
 .../logsearch/rest/UserConfigResource.java      |   17 +-
 .../ambari/logsearch/solr/SolrConstants.java    |    1 -
 .../src/main/webapp/index.html                  |  211 +-
 .../daterangepicker/css/daterangepicker.css     |  415 +++
 .../daterangepicker/js/daterangepicker.js       | 1560 ++++++++
 .../libs/custom/timezone/WorldMapGenerator.js   | 3474 ++++++++++++++++++
 .../libs/custom/timezone/jstz-1.0.4.min.js      |    2 +
 .../daterangepicker/css/daterangepicker.css     |  415 ---
 .../other/daterangepicker/js/daterangepicker.js | 1560 --------
 .../libs/other/timezone/WorldMapGenerator.js    | 3471 -----------------
 .../libs/other/timezone/jstz-1.0.4.min.js       |    2 -
 .../webapp/libs/other/timezone/mapdata.json     | 3158 ----------------
 .../src/main/webapp/scripts/Init.js             |  439 ++-
 .../scripts/views/common/DashboardLayout.js     |   80 -
 .../scripts/views/common/EventHistoryLayout.js  |    1 -
 .../views/dashboard/DashboardLayoutView.js      |  354 --
 .../scripts/views/dashboard/MainLayoutView.js   | 1259 ++++---
 .../views/dialog/ApplySearchFilterView.js       |   41 +-
 .../views/tabs/EventHistoryLayoutView.js        |    1 -
 .../dashboard/DashboardLayoutView_tmpl.html     |   28 -
 .../UserConfigRequestQueryConverterTest.java    |    4 +-
 ambari-logsearch/pom.xml                        |    1 +
 .../sink/flume/FlumeTimelineMetricsSink.java    |    2 +
 .../conf/hadoop-metrics2-hbase.properties.j2    |   49 -
 .../src/main/conf/hadoop-metrics2.properties.j2 |   58 -
 .../metrics/timeline/PhoenixHBaseAccessor.java  |    6 +-
 .../TimelineMetricAppAggregator.java            |    4 +-
 .../TimelineMetricClusterAggregatorSecond.java  |   92 +-
 .../aggregators/TimelineMetricReadHelper.java   |    3 +-
 ...melineMetricClusterAggregatorSecondTest.java |  114 +-
 ambari-server/pom.xml                           |    6 +
 ambari-server/src/main/assemblies/server.xml    |   25 +
 .../server/actionmanager/ActionDBAccessor.java  |    5 +-
 .../actionmanager/ActionDBAccessorImpl.java     |    6 +-
 .../server/actionmanager/ActionScheduler.java   |   53 +-
 .../query/render/ClusterBlueprintRenderer.java  |  122 +
 .../server/controller/ControllerModule.java     |   18 +-
 .../internal/ServiceResourceProvider.java       |    1 -
 .../metrics/RestMetricsPropertyProvider.java    |  106 +-
 .../metrics/timeline/AMSPropertyProvider.java   |    8 +
 .../system/impl/AmbariMetricSinkImpl.java       |   44 +-
 .../server/orm/dao/AlertDefinitionDAO.java      |    7 +-
 .../ambari/server/orm/dao/AlertDispatchDAO.java |   45 +-
 .../apache/ambari/server/orm/dao/ViewDAO.java   |    8 +-
 .../server/orm/entities/AlertGroupEntity.java   |    9 +-
 .../orm/entities/ServiceConfigEntity.java       |    2 +-
 .../orm/entities/ServiceDesiredStateEntity.java |   21 -
 .../org/apache/ambari/server/state/Service.java |    8 -
 .../apache/ambari/server/state/ServiceImpl.java |   40 +-
 .../ambari/server/state/theme/TabLayout.java    |    8 +-
 .../ambari/server/topology/AmbariContext.java   |   36 +-
 .../server/upgrade/UpgradeCatalog250.java       |  116 +-
 .../apache/ambari/server/view/ViewRegistry.java |   62 +
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |    1 -
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |    1 -
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |    1 -
 .../resources/Ambari-DDL-Postgres-CREATE.sql    |    1 -
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |    1 -
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |    1 -
 .../configuration/infra-solr-security-json.xml  |   62 +-
 .../0.1.0/package/scripts/params.py             |   29 +-
 .../properties/infra-solr-security.json.j2      |   46 +
 .../HDP/grafana-solr-cores-dashboard.json       | 3162 ++++++++++++++++
 .../HDP/grafana-solr-hosts-dashboard.json       |  538 +++
 .../AMBARI_METRICS/0.1.0/package/scripts/ams.py |    6 +-
 .../package/scripts/metrics_grafana_util.py     |    6 +-
 .../0.1.0/package/scripts/network.py            |   39 -
 .../0.1.0/package/scripts/params.py             |   38 +-
 .../0.1.0/package/scripts/service_check.py      |    4 +-
 .../hadoop-metrics2-hbase.properties.j2         |    4 +
 .../DRUID/0.9.2/configuration/druid-common.xml  |   16 +-
 .../0.9.2/configuration/druid-superset-env.xml  |  115 +
 .../0.9.2/configuration/druid-superset.xml      |  178 +
 .../common-services/DRUID/0.9.2/metainfo.xml    |   28 +-
 .../DRUID/0.9.2/package/scripts/druid.py        |    2 +
 .../DRUID/0.9.2/package/scripts/druid_node.py   |    2 +-
 .../DRUID/0.9.2/package/scripts/params.py       |   50 +-
 .../0.9.2/package/scripts/status_params.py      |    2 +
 .../DRUID/0.9.2/package/scripts/superset.py     |  153 +
 .../DRUID/0.9.2/package/templates/superset.sh   |   95 +
 .../DRUID/0.9.2/quicklinks/quicklinks.json      |   13 +
 .../DRUID/0.9.2/role_command_order.json         |   18 +
 .../DRUID/0.9.2/themes/theme.json               |   84 +-
 .../hadoop-metrics2.properties.xml              |  125 -
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml |    1 -
 .../package/alerts/alert_metrics_deviation.py   |   14 +-
 .../2.1.0.2.0/package/scripts/zkfc_slave.py     |    3 +-
 .../HDFS/3.0.0.3.0/configuration/core-site.xml  |   30 +-
 .../HDFS/3.0.0.3.0/configuration/hadoop-env.xml |   42 +-
 .../hadoop-metrics2.properties.xml              |    2 +-
 .../3.0.0.3.0/configuration/hadoop-policy.xml   |   22 +-
 .../HDFS/3.0.0.3.0/configuration/hdfs-log4j.xml |    2 +-
 .../configuration/hdfs-logsearch-conf.xml       |    6 +-
 .../HDFS/3.0.0.3.0/configuration/hdfs-site.xml  |  109 +-
 .../HDFS/3.0.0.3.0/configuration/ssl-client.xml |   14 +-
 .../HDFS/3.0.0.3.0/configuration/ssl-server.xml |   16 +-
 .../package/alerts/alert_metrics_deviation.py   |   14 +-
 .../3.0.0.3.0/package/scripts/params_linux.py   |    2 +-
 .../HDFS/3.0.0.3.0/package/scripts/utils.py     |    8 +-
 .../3.0.0.3.0/package/scripts/zkfc_slave.py     |    1 +
 .../HIVE/0.12.0.2.0/package/scripts/hive.py     |    2 +-
 .../package/scripts/hive_interactive.py         |    6 +-
 .../package/scripts/hive_server_interactive.py  |   12 +-
 .../0.12.0.2.0/package/scripts/params_linux.py  |   48 +-
 .../0.9.0/configuration/ranger-kafka-audit.xml  |   32 +-
 .../ranger-kafka-plugin-properties.xml          |   14 +-
 .../ranger-kafka-policymgr-ssl.xml              |   12 +-
 .../configuration/ranger-kafka-security.xml     |   12 +-
 .../ranger-knox-plugin-properties.xml           |   12 +-
 .../0.5.0/configuration/logfeeder-env.xml       |    2 +
 .../0.5.0/configuration/logsearch-env.xml       |    2 +
 .../LOGSEARCH/0.5.0/metainfo.xml                |    6 +
 .../LOGSEARCH/0.5.0/package/scripts/params.py   |   22 +-
 .../0.5.0/package/scripts/setup_logfeeder.py    |   28 +-
 .../0.5.0/package/scripts/setup_logsearch.py    |   22 +-
 .../4.0.0.2.0/package/scripts/params_linux.py   |   20 +-
 .../SPARK/1.2.1/package/scripts/params.py       |    1 +
 .../SPARK/1.2.1/package/scripts/setup_livy.py   |    8 +
 .../SPARK2/2.0.0/package/scripts/params.py      |    1 +
 .../SPARK2/2.0.0/package/scripts/setup_livy2.py |    8 +
 .../0.10.0/configuration/ranger-storm-audit.xml |   32 +-
 .../ranger-storm-policymgr-ssl.xml              |   12 +-
 .../configuration/ranger-storm-security.xml     |   12 +-
 .../common-services/STORM/0.10.0/metrics.json   |    8 +-
 .../common-services/STORM/0.9.1/alerts.json     |   30 +-
 .../common-services/STORM/0.9.1/metrics.json    |    8 +-
 .../STORM/0.9.1/quicklinks/quicklinks.json      |   25 +-
 .../common-services/STORM/0.9.3/metrics.json    |    8 +-
 .../ranger-storm-plugin-properties.xml          |   71 -
 .../configuration-mapred/mapred-env.xml         |   14 +-
 .../mapred-logsearch-conf.xml                   |    6 +-
 .../configuration-mapred/mapred-site.xml        |   90 +-
 .../YARN/3.0.0.3.0/configuration/yarn-env.xml   |   26 +-
 .../YARN/3.0.0.3.0/configuration/yarn-log4j.xml |    2 +-
 .../configuration/yarn-logsearch-conf.xml       |    6 +-
 .../YARN/3.0.0.3.0/configuration/yarn-site.xml  |  225 +-
 .../common-services/YARN/3.0.0.3.0/metainfo.xml |    6 +-
 .../YARN/3.0.0.3.0/package/scripts/service.py   |    4 +-
 .../3.0.0.3.0/package/scripts/status_params.py  |   10 +-
 .../YARN/3.0.0.3.0/service_advisor.py           |   23 +-
 .../package/scripts/livy2_config_template.py    |  107 +
 .../0.6.0.2.5/package/scripts/master.py         |   42 +-
 .../0.6.0.2.5/package/scripts/params.py         |    8 +
 .../2.0.6/hooks/before-START/scripts/params.py  |    4 +-
 .../scripts/shared_initialization.py            |   17 +-
 .../ranger-hbase-plugin-properties.xml          |   10 +-
 .../ranger-hdfs-plugin-properties.xml           |   12 +-
 .../ranger-hive-plugin-properties.xml           |   10 +-
 .../ranger-knox-plugin-properties.xml           |    2 +-
 .../services/YARN/configuration/yarn-site.xml   |    4 +-
 .../stacks/HDP/2.2/services/stack_advisor.py    |    8 +-
 .../HBASE/configuration/ranger-hbase-audit.xml  |   32 +-
 .../ranger-hbase-policymgr-ssl.xml              |   12 +-
 .../configuration/ranger-hbase-security.xml     |   14 +-
 .../configuration/ranger-hdfs-policymgr-ssl.xml |   12 +-
 .../HDFS/configuration/ranger-hdfs-security.xml |   14 +-
 .../HIVE/configuration/ranger-hive-audit.xml    |   32 +-
 .../configuration/ranger-hive-policymgr-ssl.xml |   12 +-
 .../HIVE/configuration/ranger-hive-security.xml |   14 +-
 .../ranger-kafka-policymgr-ssl.xml              |    4 +-
 .../KNOX/configuration/ranger-knox-audit.xml    |   32 +-
 .../configuration/ranger-knox-policymgr-ssl.xml |   12 +-
 .../KNOX/configuration/ranger-knox-security.xml |   12 +-
 .../ranger-storm-policymgr-ssl.xml              |    4 +-
 .../configuration/ranger-storm-security.xml     |    2 +-
 .../YARN/configuration/ranger-yarn-audit.xml    |   32 +-
 .../ranger-yarn-plugin-properties.xml           |   12 +-
 .../configuration/ranger-yarn-policymgr-ssl.xml |   12 +-
 .../YARN/configuration/ranger-yarn-security.xml |   12 +-
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  |   18 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |   18 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml     |    3 +
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  |   17 +
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |   21 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml     |    3 +
 .../ATLAS/configuration/ranger-atlas-audit.xml  |   18 +-
 .../ranger-atlas-plugin-properties.xml          |   58 +-
 .../ranger-atlas-policymgr-ssl.xml              |   12 +-
 .../configuration/ranger-atlas-security.xml     |   14 +-
 .../ranger-hbase-plugin-properties.xml          |   71 -
 .../ranger-hdfs-plugin-properties.xml           |   50 +-
 .../HIVE/configuration/beeline-log4j2.xml       |    2 +-
 .../services/HIVE/configuration/hive-env.xml    |   29 +
 .../HIVE/configuration/hive-exec-log4j.xml      |  114 +
 .../HIVE/configuration/hive-exec-log4j2.xml     |    2 +-
 .../HIVE/configuration/hive-interactive-env.xml |    8 +-
 .../services/HIVE/configuration/hive-log4j.xml  |  126 +
 .../services/HIVE/configuration/hive-log4j2.xml |    2 +-
 .../HIVE/configuration/llap-cli-log4j2.xml      |    2 +-
 .../HIVE/configuration/llap-daemon-log4j.xml    |    2 +-
 .../ranger-hive-plugin-properties.xml           |   71 -
 .../HIVE/configuration/ranger-hive-security.xml |    2 +-
 .../HIVE/configuration/webhcat-log4j.xml        |   83 +
 .../HDP/2.5/services/HIVE/themes/theme.json     |   48 +
 .../ranger-kafka-plugin-properties.xml          |   71 -
 .../ranger-knox-plugin-properties.xml           |   71 -
 .../ranger-storm-policymgr-ssl.xml              |    4 +-
 .../configuration/ranger-storm-security.xml     |    2 +-
 .../ranger-yarn-plugin-properties.xml           |   71 -
 .../services/YARN/configuration/yarn-site.xml   |    6 +
 .../stacks/HDP/2.5/services/stack_advisor.py    |   72 +-
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |   27 +
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml |    8 +-
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |   27 +
 .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml     |    2 +-
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml     |    4 +
 .../stacks/HDP/2.6/role_command_order.json      |   19 -
 .../ranger-atlas-plugin-properties.xml          |   71 +
 .../stacks/HDP/2.6/services/DRUID/kerberos.json |   52 +-
 .../stacks/HDP/2.6/services/DRUID/metainfo.xml  |    1 +
 .../ranger-hbase-plugin-properties.xml          |   71 +
 .../hadoop-metrics2.properties.xml              |  125 +
 .../ranger-hdfs-plugin-properties.xml           |   70 +
 .../stacks/HDP/2.6/services/HDFS/metainfo.xml   |    3 +
 .../HIVE/configuration/hive-interactive-env.xml |   35 +-
 .../configuration/hive-interactive-site.xml     |   16 +
 .../ranger-hive-plugin-properties.xml           |   71 +
 .../ranger-kafka-plugin-properties.xml          |   71 +
 .../ranger-knox-plugin-properties.xml           |   71 +
 .../services/SPARK/configuration/livy-conf.xml  |   24 +
 .../SPARK2/configuration/livy2-conf.xml         |   24 +
 .../ranger-storm-plugin-properties.xml          |   71 +
 .../ranger-yarn-plugin-properties.xml           |   71 +
 .../services/YARN/configuration/yarn-site.xml   |   14 +-
 .../stacks/HDP/2.6/services/stack_advisor.py    |   23 +
 .../services/YARN/configuration/yarn-site.xml   |   13 +
 .../stacks/HDPWIN/2.2/services/stack_advisor.py |    8 +-
 .../PERF/1.0/hooks/before-ANY/scripts/hook.py   |    9 +
 .../PERF/1.0/hooks/before-ANY/scripts/params.py |   44 +
 .../before-ANY/scripts/shared_initialization.py |   94 +
 .../1.0/hooks/before-INSTALL/scripts/hook.py    |    1 +
 .../1.0/hooks/before-RESTART/scripts/hook.py    |    1 +
 .../PERF/1.0/hooks/before-START/scripts/hook.py |    1 +
 .../AMBARI_METRICS/configuration/ams-site.xml   |   36 +
 .../1.0/services/AMBARI_METRICS/metainfo.xml    |   46 +
 .../PERF/1.0/services/FAKEHBASE/metainfo.xml    |    2 +-
 .../PERF/1.0/services/FAKEHDFS/metainfo.xml     |    1 -
 .../PERF/1.0/services/FAKEZOOKEEPER/alerts.json |    4 +-
 .../1.0/services/FAKEZOOKEEPER/kerberos.json    |    4 +-
 .../1.0/services/FAKEZOOKEEPER/metainfo.xml     |    7 +-
 .../package/scripts/zookeeper_client.py         |    2 +-
 .../package/scripts/zookeeper_server.py         |    2 +-
 .../stacks/PERF/1.0/services/stack_advisor.py   |   37 +
 .../src/main/resources/stacks/stack_advisor.py  |   51 +-
 .../apache/ambari/server/H2DatabaseCleaner.java |   98 +-
 .../actionmanager/TestActionScheduler.java      |  119 +-
 .../render/ClusterBlueprintRendererTest.java    |  143 +
 .../RestMetricsPropertyProviderTest.java        |    4 +-
 .../server/orm/dao/AlertDispatchDAOTest.java    |   20 +-
 .../ambari/server/orm/dao/CrudDAOTest.java      |    5 +-
 .../server/orm/dao/ServiceConfigDAOTest.java    |   13 +-
 .../ambari/server/orm/dao/UpgradeDAOTest.java   |   16 +-
 .../ComponentVersionCheckActionTest.java        |   29 +-
 .../upgrades/UpgradeActionTest.java             |   74 +-
 .../ambari/server/state/ConfigHelperTest.java   |   14 +-
 .../state/cluster/AlertDataManagerTest.java     |    6 +-
 .../AlertNoticeDispatchServiceTest.java         |  159 +-
 .../server/topology/AmbariContextTest.java      |   69 +-
 .../server/upgrade/UpgradeCatalog250Test.java   |  291 +-
 .../AMBARI_METRICS/test_metrics_collector.py    |    6 +-
 .../AMBARI_METRICS/test_metrics_grafana.py      |    7 +-
 .../2.0.6/HDFS/test_alert_metrics_deviation.py  |    2 +
 .../stacks/2.0.6/HIVE/test_hive_client.py       |    4 +-
 .../stacks/2.0.6/HIVE/test_hive_metastore.py    |    6 +-
 .../stacks/2.0.6/HIVE/test_hive_server.py       |    4 +-
 .../stacks/2.2/common/test_stack_advisor.py     |    7 +-
 .../stacks/2.4/LOGSEARCH/test_logfeeder.py      |   23 +-
 .../stacks/2.4/LOGSEARCH/test_logsearch.py      |   19 +-
 .../test/python/stacks/2.4/configs/default.json |    1 +
 .../stacks/2.5/HIVE/test_hive_server_int.py     |   12 +-
 .../python/stacks/2.5/SPARK/test_spark_livy.py  |   31 +
 .../stacks/2.5/common/test_stack_advisor.py     |  320 +-
 .../test/python/stacks/2.6/DRUID/test_druid.py  |   14 +-
 .../stacks/2.6/SPARK2/test_spark_livy2.py       |   31 +
 .../test/python/stacks/2.6/configs/default.json |    6 +-
 ambari-server/src/test/python/unitTests.py      |  106 +-
 .../HDP/2.1.1/services/STORM/metrics.json       |   10 +-
 .../rangerAdmin/step3_controller.js             |   47 +-
 .../rangerAdmin/step4_controller.js             |   68 +-
 .../rangerAdmin/wizard_controller.js            |   45 +-
 ambari-web/app/controllers/main/host/details.js |   69 +-
 ambari-web/app/controllers/main/service.js      |    2 +-
 .../controllers/main/service/info/configs.js    |   13 +-
 .../controllers/main/service/info/summary.js    |    2 +-
 ambari-web/app/controllers/main/service/item.js |   82 +-
 .../service/manage_config_groups_controller.js  |   10 +-
 .../app/mappers/component_config_mapper.js      |   68 +-
 .../app/mappers/components_state_mapper.js      |    5 +-
 .../app/mappers/configs/config_groups_mapper.js |    2 +-
 ambari-web/app/mappers/server_data_mapper.js    |    1 +
 ambari-web/app/messages.js                      |    3 +-
 .../app/mixins/common/configs/configs_loader.js |    2 +-
 .../app/mixins/common/track_request_mixin.js    |   36 +-
 ambari-web/app/models/client_component.js       |    1 +
 ambari-web/app/models/host_component.js         |   17 +-
 ambari-web/app/models/service.js                |   21 +-
 ambari-web/app/router.js                        |   37 +-
 ambari-web/app/routes/main.js                   |   15 +-
 .../app/routes/ra_high_availability_routes.js   |    8 +-
 .../modal_popups/cluster_check_dialog.hbs       |   12 +-
 .../templates/main/admin/service_auto_start.hbs |   28 +-
 .../app/templates/main/dashboard/widgets.hbs    |   10 +-
 ambari-web/app/utils/ajax/ajax.js               |    2 +-
 .../views/common/configs/config_history_flow.js |    8 +-
 .../common/modal_popups/cluster_check_popup.js  |   68 +-
 .../app/views/main/admin/service_auto_start.js  |    8 +-
 ambari-web/app/views/main/dashboard/widget.js   |   11 +-
 ambari-web/app/views/main/dashboard/widgets.js  |  116 +-
 ambari-web/app/views/main/host.js               |    1 +
 ambari-web/app/views/main/service/menu.js       |    4 +-
 .../rangerAdmin/step3_controller_test.js        |   44 +-
 .../main/host/configs_service_test.js           |    2 +
 .../test/controllers/main/host/details_test.js  |    7 +
 .../main/service/info/config_test.js            |   87 +-
 .../test/controllers/main/service/item_test.js  |  100 +-
 .../test/controllers/main/service_test.js       |   31 +-
 .../common/configs/configs_loader_test.js       |    7 +-
 ambari-web/test/models/service_test.js          |   66 +-
 .../modal_popups/cluster_check_popup_test.js    |   48 +-
 .../views/main/admin/service_auto_start_test.js |    2 +
 .../test/views/main/dashboard/widget_test.js    |   21 +-
 .../test/views/main/dashboard/widgets_test.js   |  161 +-
 ambari-web/test/views/main/host_test.js         |   18 +-
 contrib/utils/perf/deploy-gce-perf-cluster.py   |    5 +-
 .../main/resources/ui/app/controllers/queue.js  |  103 +-
 .../main/resources/ui/app/controllers/queues.js |    2 +-
 .../src/main/resources/ui/app/models/queue.js   |   11 +
 .../src/main/resources/ui/app/serializers.js    |    5 +
 .../src/main/resources/ui/app/store.js          |    9 +
 .../main/resources/ui/app/templates/queue.hbs   |   55 +-
 .../view/hive2/resources/uploads/CSVParams.java |    2 +-
 .../hive2/resources/uploads/UploadService.java  |    2 +-
 .../resources/uploads/query/QueryGenerator.java |    1 -
 .../resources/uploads/query/RowFormat.java      |    2 +-
 .../resources/uploads/query/TableInfo.java      |    2 +-
 .../resources/upload/QueryGeneratorTest.java    |    2 +-
 .../apache/ambari/view/hive20/DataMigrator.java |   19 +-
 .../view/hive20/internal/dto/ColumnInfo.java    |   32 +-
 .../view/hive20/internal/dto/TableStats.java    |   11 +
 .../internal/parsers/TableMetaParserImpl.java   |    8 +
 .../generators/AlterTableQueryGenerator.java    |   82 +-
 .../CreateDatabaseQueryGenerator.java           |   44 +
 .../DeleteDatabaseQueryGenerator.java           |    2 +-
 .../generators/InsertFromQueryGenerator.java    |   77 +
 .../query/generators/QueryGenerationUtils.java  |    5 +-
 .../view/hive20/resources/browser/DDLProxy.java |   14 +-
 .../hive20/resources/browser/DDLService.java    |   51 +-
 .../view/hive20/resources/jobs/JobService.java  |    1 +
 .../resources/system/ranger/RangerService.java  |   32 +-
 .../hive20/resources/uploads/CSVParams.java     |    2 +-
 .../resources/uploads/TableDataReader.java      |    5 +-
 .../hive20/resources/uploads/TableInput.java    |   51 -
 .../resources/uploads/UploadFromHdfsInput.java  |    8 +-
 .../hive20/resources/uploads/UploadService.java |  107 +-
 .../resources/uploads/parsers/Parser.java       |   11 +-
 .../resources/uploads/parsers/PreviewData.java  |    9 +-
 .../uploads/query/InsertFromQueryInput.java     |   10 +-
 .../resources/uploads/query/QueryGenerator.java |  143 -
 .../resources/uploads/query/RowFormat.java      |   57 -
 .../resources/uploads/query/TableInfo.java      |   97 -
 .../resources/ui/app/adapters/application.js    |   33 +-
 .../main/resources/ui/app/adapters/database.js  |    8 +
 .../resources/ui/app/adapters/file-resource.js  |   26 +
 .../resources/ui/app/adapters/file-uploader.js  |   28 +
 .../src/main/resources/ui/app/adapters/query.js |    5 +
 .../resources/ui/app/adapters/saved-query.js    |    2 +-
 .../src/main/resources/ui/app/adapters/table.js |   15 +
 .../src/main/resources/ui/app/adapters/udf.js   |   39 +
 .../resources/ui/app/adapters/upload-table.js   |   93 +
 .../resources/ui/app/components/column-item.js  |    1 +
 .../ui/app/components/create-database-form.js   |   59 +
 .../resources/ui/app/components/create-table.js |    6 +-
 .../ui/app/components/csv-format-params.js      |   76 +
 .../resources/ui/app/components/edit-table.js   |  220 ++
 .../ui/app/components/fileresource-item.js      |   73 +
 .../resources/ui/app/components/jobs-browser.js |   39 +-
 .../ui/app/components/property-item.js          |    1 +
 .../resources/ui/app/components/query-editor.js |   10 +-
 .../ui/app/components/query-result-table.js     |    4 +
 .../resources/ui/app/components/radio-button.js |   40 +
 .../resources/ui/app/components/simple-table.js |   22 +
 .../app/components/table-advanced-settings.js   |   10 +
 .../ui/app/components/table-columns.js          |    3 +-
 .../ui/app/components/table-properties.js       |    3 +-
 .../ui/app/components/table-rename-form.js      |   63 +
 .../ui/app/components/table-statistics.js       |    2 +-
 .../resources/ui/app/components/udf-edit.js     |   40 +
 .../resources/ui/app/components/udf-item.js     |  154 +
 .../main/resources/ui/app/components/udf-new.js |   41 +
 .../ui/app/components/upload-table-source.js    |   48 +
 .../resources/ui/app/components/upload-table.js |   60 +
 .../ui/app/components/validated-text-field.js   |   62 +
 .../ui/app/components/visual-explain-detail.js  |   31 +
 .../ui/app/components/visual-explain.js         |   89 +
 .../resources/ui/app/configs/edit-table-tabs.js |   48 +
 .../resources/ui/app/configs/file-format.js     |    4 +-
 .../main/resources/ui/app/configs/helpers.js    |   14 +-
 .../resources/ui/app/controllers/application.js |    5 +-
 .../resources/ui/app/controllers/messages.js    |   30 +
 .../ui/app/controllers/messages/message.js      |   31 +
 .../resources/ui/app/controllers/saved-query.js |   22 +
 .../main/resources/ui/app/controllers/udfs.js   |   22 +
 .../resources/ui/app/controllers/udfs/new.js    |   23 +
 .../app/helpers/alert-message-context-class.js  |   27 +
 .../ui/app/helpers/alert-message-icon-class.js  |   37 +
 .../resources/ui/app/helpers/shorten-text.js    |   32 +
 .../resources/ui/app/locales/en/translations.js |  111 +
 .../main/resources/ui/app/mixins/ui-logger.js   |   15 +
 .../src/main/resources/ui/app/models/column.js  |   33 +-
 .../resources/ui/app/models/file-resource.js    |   25 +
 .../src/main/resources/ui/app/models/udf.js     |   26 +
 .../hive20/src/main/resources/ui/app/router.js  |   12 +-
 .../main/resources/ui/app/routes/application.js |    3 +-
 .../main/resources/ui/app/routes/databases.js   |   16 +-
 .../databases/database/tables/new-database.js   |   65 +
 .../app/routes/databases/database/tables/new.js |   84 +-
 .../routes/databases/database/tables/table.js   |    8 +-
 .../databases/database/tables/table/edit.js     |   82 +
 .../databases/database/tables/table/rename.js   |   80 +
 .../databases/database/tables/upload-table.js   |  784 ++++
 .../src/main/resources/ui/app/routes/jobs.js    |    3 -
 .../resources/ui/app/routes/queries/query.js    |  136 +-
 .../src/main/resources/ui/app/routes/query.js   |  305 --
 .../resources/ui/app/routes/savedqueries.js     |   50 +-
 .../main/resources/ui/app/routes/settings.js    |   10 +-
 .../src/main/resources/ui/app/routes/udfs.js    |   50 +
 .../main/resources/ui/app/routes/udfs/new.js    |  161 +
 .../resources/ui/app/services/alert-messages.js |   13 +-
 .../resources/ui/app/services/file-resource.js  |   33 +
 .../src/main/resources/ui/app/services/jobs.js  |    3 +
 .../src/main/resources/ui/app/services/query.js |   14 +-
 .../resources/ui/app/services/saved-queries.js  |    5 +-
 .../ui/app/services/table-operations.js         |   54 +-
 .../src/main/resources/ui/app/services/udf.js   |   76 +
 .../src/main/resources/ui/app/styles/app.scss   |  202 +-
 .../app/templates/components/alert-message.hbs  |    2 +-
 .../ui/app/templates/components/column-item.hbs |   15 +-
 .../app/templates/components/confirm-dialog.hbs |    2 +-
 .../components/create-database-form.hbs         |   31 +
 .../templates/components/csv-format-params.hbs  |  130 +
 .../ui/app/templates/components/edit-table.hbs  |   65 +
 .../app/templates/components/export-result.hbs  |    2 +-
 .../templates/components/fileresource-item.hbs  |   32 +
 .../templates/components/hdfs-viewer-modal.hbs  |    2 +-
 .../ui/app/templates/components/info-dialog.hbs |    2 +-
 .../ui/app/templates/components/job-item.hbs    |    2 +-
 .../app/templates/components/jobs-browser.hbs   |   17 +-
 .../ui/app/templates/components/list-item.hbs   |    2 +-
 .../app/templates/components/property-item.hbs  |   10 +-
 .../templates/components/query-result-table.hbs |    4 +-
 .../app/templates/components/radio-button.hbs   |   19 +
 .../app/templates/components/simple-table.hbs   |   42 +
 .../components/table-advanced-settings.hbs      |  297 +-
 .../app/templates/components/table-columns.hbs  |    1 +
 .../templates/components/table-properties.hbs   |    1 +
 .../templates/components/table-rename-form.hbs  |   31 +
 .../templates/components/table-statistics.hbs   |    4 +
 .../ui/app/templates/components/udf-edit.hbs    |   67 +
 .../ui/app/templates/components/udf-item.hbs    |   76 +
 .../ui/app/templates/components/udf-new.hbs     |   61 +
 .../components/upload-table-source.hbs          |  112 +
 .../app/templates/components/upload-table.hbs   |   59 +
 .../components/validated-text-field.hbs         |   23 +
 .../components/visual-explain-detail.hbs        |   29 +
 .../app/templates/components/visual-explain.hbs |   42 +
 .../ui/app/templates/databases-loading.hbs      |   21 +
 .../resources/ui/app/templates/databases.hbs    |    4 +-
 .../databases/database/tables-loading.hbs       |   24 +
 .../databases/database/tables/new-database.hbs  |   47 +
 .../templates/databases/database/tables/new.hbs |    6 +-
 .../databases/database/tables/table-loading.hbs |   21 +
 .../databases/database/tables/table.hbs         |    7 +-
 .../databases/database/tables/table/auth.hbs    |   41 +-
 .../databases/database/tables/table/edit.hbs    |   45 +
 .../databases/database/tables/table/rename.hbs  |   46 +
 .../databases/database/tables/upload-table.hbs  |   45 +
 .../resources/ui/app/templates/jobs-loading.hbs |   20 +
 .../resources/ui/app/templates/messages.hbs     |   14 +-
 .../ui/app/templates/messages/message.hbs       |    6 +-
 .../ui/app/templates/queries/query.hbs          |   69 +-
 .../main/resources/ui/app/templates/query.hbs   |   84 -
 .../ui/app/templates/savedqueries-loading.hbs   |   21 +
 .../resources/ui/app/templates/savedqueries.hbs |    6 +-
 .../ui/app/templates/service-check.hbs          |    2 +-
 .../ui/app/templates/settings-loading.hbs       |   21 +
 .../resources/ui/app/templates/udfs-loading.hbs |   21 +
 .../main/resources/ui/app/templates/udfs.hbs    |   28 +
 .../resources/ui/app/templates/udfs/new.hbs     |   30 +
 .../main/resources/ui/app/utils/constants.js    |   64 +
 .../resources/ui/app/utils/hive-explainer.js    |  645 ++++
 .../hive20/src/main/resources/ui/bower.json     |    5 +-
 .../src/main/resources/ui/config/environment.js |   10 +
 .../src/main/resources/ui/ember-cli-build.js    |    3 +
 .../hive20/src/main/resources/ui/package.json   |    3 +
 .../views/hive20/src/main/resources/view.xml    |    2 +-
 .../AlterTableQueryGenerationSpecTest.groovy    |   59 -
 .../AlterTableQueryGeneratorTest.java           |  161 +-
 .../resources/upload/DataParserCSVTest.java     |   29 +-
 .../resources/upload/DataParserJSONTest.java    |   37 +-
 .../resources/upload/DataParserXMLTest.java     |   20 +-
 .../resources/upload/QueryGeneratorTest.java    |  108 -
 .../resources/upload/TableDataReaderTest.java   |    5 +-
 ...HiveHistoryQueryMigrationImplementation.java |    6 +-
 .../ui/app/components/bundle-config.js          |    1 +
 .../resources/ui/app/components/coord-config.js |    1 +
 .../ui/app/components/decision-add-branch.js    |    3 +-
 .../ui/app/components/designer-workspace.js     |   37 +-
 .../resources/ui/app/components/drafts-wf.js    |   55 +-
 .../ui/app/components/flow-designer.js          |   27 +-
 .../resources/ui/app/components/job-details.js  |   52 +-
 .../ui/app/components/transition-config.js      |    2 +-
 .../ui/app/domain/cytoscape-flow-renderer.js    |   38 +-
 .../resources/ui/app/domain/findnode-mixin.js   |   10 +-
 .../resources/ui/app/domain/node-handler.js     |   10 +-
 .../src/main/resources/ui/app/domain/node.js    |    2 +-
 .../main/resources/ui/app/domain/workflow.js    |    6 +-
 .../src/main/resources/ui/app/routes/design.js  |    7 -
 .../src/main/resources/ui/app/styles/app.less   |   41 +-
 .../templates/components/designer-workspace.hbs |   73 +-
 .../ui/app/templates/components/drafts-wf.hbs   |   19 +-
 .../app/templates/components/flow-designer.hbs  |    2 +-
 .../ui/app/templates/components/help-icon.hbs   |    2 +-
 .../resources/ui/app/templates/dashboard.hbs    |    2 +-
 .../main/resources/ui/app/utils/constants.js    |    4 +-
 docs/pom.xml                                    |   16 +-
 pom.xml                                         |    4 +
 560 files changed, 25349 insertions(+), 14799 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/341cb124/ambari-server/src/main/resources/Ambari-DDL-Derby-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/341cb124/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/341cb124/ambari-server/src/main/resources/Ambari-DDL-Oracle-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/341cb124/ambari-server/src/main/resources/Ambari-DDL-Postgres-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/341cb124/ambari-server/src/main/resources/Ambari-DDL-SQLAnywhere-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/341cb124/ambari-server/src/main/resources/Ambari-DDL-SQLServer-CREATE.sql
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/341cb124/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ComponentVersionCheckActionTest.java
----------------------------------------------------------------------