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

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

Branch: refs/heads/trunk
Commit: f6bc79797ee3f10fc3c9fbda51fee1c54bab04cd
Parents: 353a076 baefbcc
Author: Nate Cole <nc...@hortonworks.com>
Authored: Wed Mar 1 15:38:06 2017 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Wed Mar 1 15:38:06 2017 -0500

----------------------------------------------------------------------
 ambari-agent/pom.xml                            |  35 ++
 .../apache/ambari/tools/jce/JcePolicyInfo.java  | 145 +++++
 .../ambari_agent/CustomServiceOrchestrator.py   |   2 +
 .../main/python/ambari_agent/PythonExecutor.py  |  12 +-
 ambari-agent/src/packages/tarball/all.xml       |   1 +
 .../src/main/python/ambari_commons/network.py   |  41 +-
 .../core/resources/jcepolicyinfo.py             |  47 ++
 .../resource_management/core/signal_utils.py    |   1 +
 .../libraries/functions/__init__.py             |   1 +
 .../libraries/functions/constants.py            |   1 +
 .../functions/log_process_information.py        |  40 ++
 .../functions/setup_ranger_plugin_xml.py        |   1 +
 .../apache/ambari/logsearch/util/SSLUtil.java   |   7 +-
 ambari-logsearch/docker/bin/start.sh            |  12 +-
 ambari-logsearch/docker/logsearch-docker.sh     |   2 +-
 .../test-config/logsearch/logsearch-env.sh      |   4 +-
 .../src/main/assembly/collector.xml             |   2 +
 .../src/main/assembly/sink.xml                  |   7 +-
 .../src/main/assemblies/jar-with-common.xml     |   1 +
 .../conf/unix/ambari-metrics-grafana            |  17 +-
 .../src/main/assemblies/jar-with-common.xml     |   3 +-
 .../src/main/assemblies/jar-with-common.xml     |   1 +
 .../src/main/assemblies/simulator.xml           |   4 +-
 .../timeline/HBaseTimelineMetricStore.java      |  18 +-
 .../metrics/timeline/PhoenixHBaseAccessor.java  | 199 ++++---
 .../timeline/TimelineMetricConfiguration.java   |  35 +-
 .../MetricCollectorHAController.java            |  14 +-
 .../timeline/ITPhoenixHBaseAccessor.java        |  21 +-
 ambari-project/pom.xml                          |   6 +-
 ambari-server/docs/configuration/index.md       |   7 +-
 ambari-server/src/main/assemblies/server.xml    |  45 +-
 .../ambari/server/agent/ExecutionCommand.java   |   2 +
 .../server/configuration/Configuration.java     |  18 +-
 .../AmbariCustomCommandExecutionHelper.java     |   7 +
 .../AmbariManagementControllerImpl.java         |  40 +-
 .../server/controller/KerberosHelperImpl.java   |   1 +
 .../server/controller/ServiceRequest.java       |  19 +-
 .../server/controller/StackServiceResponse.java |  24 +
 .../internal/ClientConfigResourceProvider.java  |   7 +
 .../internal/ServiceResourceProvider.java       |  40 +-
 .../internal/StackServiceResourceProvider.java  |  18 +-
 .../logging/LoggingSearchPropertyProvider.java  |  10 +-
 .../ambari/server/controller/logging/Utils.java |  14 +
 .../listeners/upgrade/StackVersionListener.java |   2 +-
 .../ambari/server/stack/ComponentModule.java    |   4 +
 .../ambari/server/state/ComponentInfo.java      |  16 +-
 .../ambari/server/state/ConfigHelper.java       | 169 ++++++
 .../server/state/CredentialStoreInfo.java       | 158 +++---
 .../ambari/server/state/PropertyInfo.java       |   4 +
 .../org/apache/ambari/server/state/Service.java |   7 +
 .../apache/ambari/server/state/ServiceImpl.java |  24 +-
 .../apache/ambari/server/state/ServiceInfo.java |  32 ++
 .../state/UnlimitedKeyJCERequirement.java       |  42 ++
 .../ambari/server/state/UserGroupInfo.java      |  50 ++
 .../server/state/ValueAttributesInfo.java       |  15 +
 .../server/state/cluster/ClusterImpl.java       |   3 +-
 .../stack/upgrade/StageWrapperBuilder.java      |   8 +-
 .../ambari/server/topology/TopologyManager.java | 131 +++--
 .../server/upgrade/UpgradeCatalog250.java       |  98 ++++
 .../ambari/server/utils/VersionUtils.java       |   6 +-
 .../python/ambari_server/serverConfiguration.py |  25 +
 .../src/main/python/ambari_server_main.py       |  24 +-
 .../ACCUMULO/1.6.1.2.2.0/metainfo.xml           |   1 -
 .../0.1.0/configuration/ams-site.xml            |   8 -
 .../package/scripts/metrics_grafana_util.py     |  27 +-
 .../ATLAS/0.1.0.2.3/kerberos.json               |   5 +-
 .../configuration/application-properties.xml    |  10 +-
 .../ATLAS/0.7.0.2.5/kerberos.json               |   5 +-
 .../FLUME/1.4.0.2.0/metainfo.xml                |   1 -
 .../FLUME/1.4.0.2.0/package/scripts/flume.py    |   4 +-
 .../HBASE/0.96.0.2.0/metainfo.xml               |   1 -
 .../common-services/HDFS/2.1.0.2.0/metainfo.xml |   1 -
 .../ranger-hdfs-plugin-properties.xml           |  10 +
 .../HDFS/3.0.0.3.0/service_advisor.py           |  24 +
 .../common-services/KAFKA/0.10.0/kerberos.json  |   6 +
 .../common-services/KAFKA/0.8.1/metainfo.xml    |   1 -
 .../KAFKA/0.8.1/package/scripts/kafka_broker.py |   5 +-
 .../common-services/KAFKA/0.9.0/kerberos.json   |   6 +
 .../package/scripts/kerberos_client.py          |   6 -
 .../package/scripts/kerberos_common.py          |  35 +-
 .../LOGSEARCH/0.5.0/kerberos.json               |   5 +-
 .../common-services/RANGER/0.6.0/kerberos.json  |   5 +-
 .../common-services/RANGER/0.6.0/metainfo.xml   |   2 -
 .../common-services/SPARK2/2.0.0/kerberos.json  |   2 +-
 .../2.0.0/package/scripts/job_history_server.py |   2 +-
 .../2.0.0/package/scripts/livy2_server.py       |   2 +-
 .../2.0.0/package/scripts/spark_client.py       |   2 +-
 .../package/scripts/spark_thrift_server.py      |   9 +-
 .../common-services/STORM/0.9.1/metainfo.xml    |   1 -
 .../common-services/STORM/1.0.1/kerberos.json   |   2 +-
 .../common-services/STORM/1.0.1/metainfo.xml    |   1 -
 .../common-services/YARN/2.1.0.2.0/metainfo.xml |   2 -
 .../YARN/2.1.0.2.0/package/scripts/service.py   |  10 +-
 .../ranger-yarn-plugin-properties.xml           |  10 +
 .../YARN/3.0.0.3.0/package/scripts/service.py   |   9 +-
 .../YARN/3.0.0.3.0/service_advisor.py           |  70 ++-
 .../ZEPPELIN/0.6.0.2.5/kerberos.json            |   8 +
 .../ZEPPELIN/0.6.0.2.5/metainfo.xml             |   4 +
 .../src/main/resources/configuration-schema.xsd |  17 +
 .../custom_actions/scripts/ru_set_all.py        |  65 ++-
 .../src/main/resources/properties.json          |   1 +
 .../src/main/resources/scripts/configs.sh       |   5 +-
 .../HDP/2.0.6/configuration/cluster-env.xml     |  11 +
 .../2.0.6/hooks/before-ANY/scripts/params.py    |   9 +-
 .../2.0.6/hooks/before-START/scripts/hook.py    |   3 +-
 .../2.0.6/hooks/before-START/scripts/params.py  |  27 +-
 .../scripts/shared_initialization.py            |  64 +++
 .../HDP/2.0.6/properties/stack_features.json    |   5 +
 .../stacks/HDP/2.3/services/RANGER/metainfo.xml |   4 -
 .../stacks/HDP/2.4/services/RANGER/metainfo.xml |   4 -
 .../configuration/hive-interactive-site.xml     |   4 +-
 .../HIVE/configuration/llap-daemon-log4j.xml    |  10 +-
 .../HIVE/configuration/tez-interactive-site.xml |   2 +-
 .../stacks/HDP/2.5/services/RANGER/metainfo.xml |   4 -
 .../HDP/2.5/services/ZEPPELIN/kerberos.json     |  53 ++
 .../stacks/HDP/2.5/services/stack_advisor.py    |  56 +-
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |  16 +
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.5.xml |   5 +-
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |  59 +-
 .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml     |   6 +-
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml     |  46 +-
 .../ranger-atlas-plugin-properties.xml          |  20 +
 .../ranger-hbase-plugin-properties.xml          |  17 +
 .../ranger-hdfs-plugin-properties.xml           |  18 +
 .../ranger-hive-plugin-properties.xml           |  18 +
 .../HIVE/configuration/tez-interactive-site.xml |  15 +-
 .../ranger-kafka-plugin-properties.xml          |  17 +
 .../stacks/HDP/2.6/services/RANGER/metainfo.xml |   4 -
 .../HDP/2.6/services/SPARK2/kerberos.json       |   2 +-
 .../2.6/services/TEZ/configuration/tez-site.xml |   6 +
 .../ranger-yarn-plugin-properties.xml           |  17 +
 .../HDP/2.6/services/ZEPPELIN/kerberos.json     |  53 ++
 .../stacks/HDP/2.6/services/stack_advisor.py    | 119 +++-
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |  56 +-
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml     |  47 +-
 .../HDP/3.0/configuration/cluster-env.xml       |  11 +
 .../HDP/3.0/hooks/before-START/scripts/hook.py  |   3 +-
 .../3.0/hooks/before-START/scripts/params.py    |  27 +-
 .../scripts/shared_initialization.py            |  64 +++
 .../HDP/3.0/properties/stack_features.json      |  50 ++
 .../PERF/1.0/services/FAKEHBASE/metainfo.xml    |   1 -
 .../PERF/1.0/services/FAKEHDFS/metainfo.xml     |   1 -
 .../PERF/1.0/services/FAKEYARN/metainfo.xml     |   2 -
 .../KERBEROS/package/scripts/kerberos_client.py |   3 -
 .../server/api/services/AmbariMetaInfoTest.java |   2 +-
 .../AmbariCustomCommandExecutionHelperTest.java |  68 ++-
 .../AmbariManagementControllerTest.java         | 106 +++-
 .../ClientConfigResourceProviderTest.java       |  54 +-
 .../internal/UpgradeResourceProviderTest.java   |  76 +--
 .../server/stack/ComponentModuleTest.java       |  35 ++
 .../ambari/server/stack/ServiceModuleTest.java  |   7 +-
 .../ambari/server/stack/StackManagerTest.java   |   2 +-
 .../ambari/server/state/ServiceInfoTest.java    |   4 +
 .../stack/upgrade/StageWrapperBuilderTest.java  |   2 +
 .../server/upgrade/UpgradeCatalog250Test.java   |  99 +++-
 .../ambari/server/utils/TestVersionUtils.java   |  46 ++
 .../src/test/python/TestAmbariServer.py         |  26 +-
 .../python/custom_actions/test_ru_set_all.py    |  61 ++-
 .../python/stacks/2.0.6/configs/default.json    |   1 +
 .../2.0.6/configs/secured_no_jce_name.json      |  16 +-
 .../hooks/before-START/test_before_start.py     |  26 +-
 .../stacks/2.2/KERBEROS/test_kerberos_client.py |  21 -
 .../stacks/2.5/common/test_stack_advisor.py     |  44 +-
 .../stacks/2.6/common/test_stack_advisor.py     | 539 ++++++++++++++++++-
 ...test_kerberos_descriptor_2_5_infra_solr.json | 217 ++++++++
 .../services/HDFS/configuration/hadoop-env.xml  |  53 ++
 .../stacks/HDP/2.2.0/services/HDFS/metainfo.xml |   6 +-
 .../HDP/2.2.0/services/STORM/metainfo.xml       |   6 +
 .../HDP/2.2.0/services/ZOOKEEPER/metainfo.xml   |   6 +-
 ambari-web/app/app.js                           |   2 +-
 ambari-web/app/assets/test/tests.js             |   7 +
 ambari-web/app/config.js                        |   1 -
 ambari-web/app/controllers/experimental.js      |   2 +-
 .../app/controllers/global/update_controller.js |   3 +-
 .../nameNode/step2_controller.js                |   5 +-
 .../nameNode/step3_controller.js                |  24 +-
 .../nameNode/step4_controller.js                |   6 +-
 .../nameNode/step5_controller.js                |  30 +-
 .../nameNode/step6_controller.js                |  34 +-
 .../nameNode/step9_controller.js                |  76 +--
 .../main/admin/kerberos/step8_controller.js     |   2 +-
 .../main/admin/stack_and_upgrade_controller.js  |  11 +-
 .../alert_definitions_actions_controller.js     |  28 +-
 .../alerts/manage_alert_groups_controller.js    |   2 +-
 ambari-web/app/controllers/main/host.js         |  25 +-
 .../main/host/bulk_operations_controller.js     |  33 +-
 ambari-web/app/controllers/main/host/details.js |  24 +-
 ambari-web/app/controllers/main/service.js      |  13 +-
 ambari-web/app/controllers/main/service/item.js |  30 +-
 .../service/manage_config_groups_controller.js  |   5 +-
 .../app/controllers/main/views_controller.js    |   2 +
 ambari-web/app/messages.js                      |   1 -
 .../mixins/common/configs/configs_comparator.js |   4 +-
 .../mixins/common/table_server_view_mixin.js    |   2 +
 .../configs/component_actions_by_configs.js     |  44 +-
 .../wizard/wizardProgressPageController.js      |   7 +-
 ambari-web/app/routes/main.js                   |   4 +
 ambari-web/app/styles/application.less          |   8 +-
 ambari-web/app/styles/config_history_flow.less  |   7 +-
 ambari-web/app/styles/modal_popups.less         |   2 -
 .../app/styles/theme/bootstrap-ambari.css       |   5 +-
 ambari-web/app/styles/top-nav.less              |   2 +-
 ambari-web/app/templates/main/admin.hbs         |  17 +-
 .../alerts/manage_alert_notifications_popup.hbs |   3 +-
 .../templates/main/host/combo_search_box.hbs    |  15 +-
 .../templates/main/service/services/yarn.hbs    |  15 +-
 ambari-web/app/utils/ajax/ajax.js               |  24 +-
 .../app/utils/batch_scheduled_requests.js       |   6 +-
 ambari-web/app/utils/ember_reopen.js            | 105 ++++
 ambari-web/app/utils/hosts.js                   |   2 +-
 ambari-web/app/views/application.js             |   7 +-
 .../app/views/common/buttons/wizard_buttons.js  |   6 +-
 .../configs/overriddenPropertyRow_view.js       |  21 +-
 ambari-web/app/views/common/modal_popup.js      |   9 +
 ambari-web/app/views/common/table_view.js       |   8 +
 .../alerts/manage_alert_notifications_view.js   |  13 +-
 ambari-web/app/views/main/host.js               |   8 +-
 ambari-web/app/views/main/menu.js               |   1 -
 .../app/views/main/service/info/configs.js      |   2 +-
 .../app/views/main/service/services/yarn.js     |   1 -
 ambari-web/app/views/main/views_view.js         |   2 +-
 .../nameNode/step1_controller_test.js           | 132 +++++
 .../nameNode/step2_controller_test.js           |  86 ++-
 .../nameNode/step3_controller_test.js           | 209 ++++++-
 .../nameNode/step4_controller_test.js           |  80 ++-
 .../nameNode/step5_controller_test.js           | 312 +++++++++++
 .../nameNode/step6_controller_test.js           | 195 +++++++
 .../nameNode/step7_controller_test.js           | 120 +++++
 .../nameNode/step8_controller_test.js           |  51 ++
 .../nameNode/step9_controller_test.js           | 342 ++++++++++++
 .../nameNode/wizard_controller_test.js          | 416 ++++++++++++++
 .../admin/kerberos/step8_controller_test.js     |   2 +-
 .../admin/stack_and_upgrade_controller_test.js  |  65 +++
 .../test/controllers/main/service_test.js       |   6 +-
 .../common/table_server_view_mixin_test.js      |  17 +
 .../component_actions_by_configs_test.js        | 301 +++++++++++
 ambari-web/test/utils/ember_reopen_test.js      | 112 ++++
 ambari-web/test/views/common/table_view_test.js |  26 +-
 .../manage_alert_notifications_view_test.js     |  14 -
 ambari-web/test/views/main/host_test.js         |   7 +
 .../views/main/service/services/yarn_test.js    |   2 +-
 .../vendor/scripts/theme/bootstrap-ambari.js    |   6 +-
 contrib/views/commons/pom.xml                   |  12 -
 contrib/views/files/pom.xml                     |  16 +-
 contrib/views/hive-next/pom.xml                 |  28 +-
 .../ambari/view/hive2/actor/JdbcConnector.java  |   9 +
 .../view/hive2/actor/ResultSetIterator.java     |   2 +-
 .../hive2/actor/message/job/NoMoreItems.java    |  16 +-
 .../backgroundjobs/BackgroundJobController.java |  45 +-
 .../backgroundjobs/BackgroundJobException.java  |  30 ++
 .../view/hive2/client/NonPersistentCursor.java  |   3 +
 .../view/hive2/resources/jobs/JobService.java   |   5 +-
 .../jobs/viewJobs/JobControllerImpl.java        |  28 +-
 contrib/views/hive20/pom.xml                    |  60 +--
 .../apache/ambari/view/hive20/HiveViewImpl.java |   5 +
 .../ambari/view/hive20/actor/JdbcConnector.java |  10 +
 .../view/hive20/actor/ResultSetIterator.java    |   2 +-
 .../hive20/actor/message/job/NoMoreItems.java   |  16 +-
 .../backgroundjobs/BackgroundJobController.java |  47 +-
 .../backgroundjobs/BackgroundJobException.java  |  30 ++
 .../view/hive20/client/NonPersistentCursor.java |   3 +
 .../view/hive20/internal/dto/ColumnInfo.java    |  19 +-
 .../generators/AlterTableQueryGenerator.java    |   2 +-
 .../generators/AnalyzeTableQueryGenerator.java  |  49 +-
 .../generators/CreateTableQueryGenerator.java   |   9 +-
 .../FetchColumnStatsQueryGenerator.java         |   2 +-
 .../generators/InsertFromQueryGenerator.java    |   6 +-
 .../generators/RenameTableQueryGenerator.java   |   4 +-
 .../view/hive20/resources/browser/DDLProxy.java |   6 +-
 .../hive20/resources/browser/DDLService.java    |   4 +-
 .../view/hive20/resources/jobs/JobService.java  |   7 +-
 .../jobs/viewJobs/JobControllerImpl.java        |  29 +-
 .../savedQueries/SavedQueryResourceManager.java |  44 +-
 .../resources/system/ranger/RangerService.java  |   9 +-
 .../src/main/resources/ui/app/adapters/job.js   |  43 +-
 .../src/main/resources/ui/app/adapters/query.js |   2 +-
 .../ui/app/components/edit-setting-item.js      |   2 +-
 .../resources/ui/app/components/jobs-browser.js |  15 +-
 .../ui/app/components/notification-message.js   |  30 ++
 .../resources/ui/app/components/query-editor.js |   1 -
 .../ui/app/controllers/messages/message.js      |  31 --
 .../resources/ui/app/routes/databases-error.js  |  27 +
 .../main/resources/ui/app/routes/databases.js   |  24 +-
 .../ui/app/routes/databases/database-error.js   |  27 +
 .../routes/databases/database/tables-error.js   |  27 +
 .../ui/app/routes/databases/database/tables.js  |  14 +-
 .../databases/database/tables/table-error.js    |  27 +
 .../resources/ui/app/routes/queries/index.js    |   2 +-
 .../resources/ui/app/routes/queries/query.js    | 157 +++---
 .../ui/app/routes/queries/query/results.js      |  59 +-
 .../app/routes/queries/query/visual-explain.js  |  11 +-
 .../resources/ui/app/routes/savedqueries.js     |  41 +-
 .../main/resources/ui/app/routes/settings.js    |   5 +
 .../resources/ui/app/services/alert-messages.js |  12 +-
 .../src/main/resources/ui/app/services/jobs.js  |   3 +-
 .../src/main/resources/ui/app/services/query.js |   9 +-
 .../resources/ui/app/services/saved-queries.js  |  10 +
 .../resources/ui/app/services/tez-view-info.js  |  26 +-
 .../src/main/resources/ui/app/styles/app.scss   |   7 +-
 .../ui/app/styles/bootstrap-overrides.scss      |  20 +
 .../ui/app/templates/components/edit-table.hbs  |   2 +-
 .../components/notification-message.hbs         |  48 ++
 .../components/table-advanced-settings.hbs      |   2 +-
 .../ui/app/templates/databases-error.hbs        |  19 +
 .../app/templates/databases/database-error.hbs  |  19 +
 .../databases/database/tables-error.hbs         |  19 +
 .../databases/database/tables/table-error.hbs   |  19 +
 .../databases/database/tables/table/edit.hbs    |   2 +-
 .../ui/app/templates/messages/message.hbs       |  31 +-
 .../main/resources/ui/app/templates/queries.hbs |   4 +-
 .../ui/app/templates/queries/query/log.hbs      |   8 +-
 .../ui/app/templates/queries/query/results.hbs  |  11 +-
 .../ui/app/templates/queries/query/tez-ui.hbs   |  11 +-
 .../templates/queries/query/visual-explain.hbs  |   9 +-
 .../ui/app/utils/hive-explainer/processor.js    |  99 +++-
 .../ui/app/utils/hive-explainer/renderer.js     |  55 +-
 .../ui/app/utils/hive-explainer/transformer.js  | 130 +++--
 .../src/main/resources/ui/config/environment.js |   2 +-
 .../src/main/resources/ui/ember-cli-build.js    |   1 +
 .../AlterTableQueryGeneratorTest.java           |   4 +-
 .../AnalyzeTableQueryGeneratorSpecTest.groovy   | 194 +++++++
 .../CreateTableQueryGeneratorTest.java          |  11 +-
 .../InsertFromQueryGeneratorSpecTest.groovy     |  66 +++
 .../RenameTableQueryGeneratorSpecTest.groovy    |   4 +-
 .../historyqueryset/OracleQuerySetAmbariDB.java |   7 +-
 .../instancedetail/OracleQuerySetAmbariDB.java  |   4 +-
 .../savedqueryset/OracleQuerySetAmbariDB.java   |   8 +-
 .../instancedetail/OracleQuerySetAmbariDB.java  |   2 +-
 .../pig/jobqueryset/OracleQuerySetAmbariDB.java |   2 +-
 .../pig/jobqueryset/QuerySetAmbariDB.java       |   2 +-
 .../OracleQuerySetAmbariDB.java                 |   2 +-
 .../savedscriptqueryset/QuerySetAmbariDB.java   |   2 +-
 .../historyqueryset/OracleQuerySetHueDB.java    |  16 +-
 .../hive/savedqueryset/OracleQuerySetHueDb.java |  12 +-
 .../pig/jobqueryset/OracleQuerySetHueDb.java    |  12 +-
 .../OracleQuerySetHueDb.java                    |  18 +-
 contrib/views/pig/pom.xml                       |  26 +-
 contrib/views/pom.xml                           |   2 -
 contrib/views/utils/pom.xml                     |  51 +-
 contrib/views/wfmanager/pom.xml                 |  14 +-
 .../ui/app/components/bundle-config.js          |  17 +
 .../resources/ui/app/components/coord-config.js |  44 +-
 .../ui/app/components/designer-workspace.js     |  48 +-
 .../ui/app/components/flow-designer.js          |  81 +--
 .../resources/ui/app/components/hive-action.js  |  26 +-
 .../resources/ui/app/components/hive2-action.js |  26 +-
 .../resources/ui/app/components/java-action.js  |  24 +-
 .../resources/ui/app/components/job-config.js   |   6 +-
 .../resources/ui/app/components/job-details.js  |   1 -
 .../main/resources/ui/app/components/job-row.js |   2 +-
 .../ui/app/components/map-red-action.js         |   1 +
 .../main/resources/ui/app/components/save-wf.js |   3 +-
 .../resources/ui/app/components/search-table.js |  47 +-
 .../resources/ui/app/components/sla-info.js     |  48 +-
 .../resources/ui/app/components/sqoop-action.js |  65 ++-
 .../resources/ui/app/components/ssh-action.js   |  14 +-
 .../ui/app/components/workflow-action-editor.js |   2 +-
 .../ui/app/components/workflow-job-action.js    |  35 ++
 .../ui/app/components/workflow-job-details.js   |  12 +-
 .../ui/app/domain/action-type-resolver.js       |   5 +-
 .../ui/app/domain/actionjob_hanlder.js          |   2 +-
 .../app/domain/bundle/bundle-xml-generator.js   |   1 -
 .../coordinator/coordinator-xml-generator.js    |   1 -
 .../coordinator/coordinator-xml-importer.js     |   6 +-
 .../ui/app/domain/cytoscape-flow-renderer.js    |  17 +-
 .../resources/ui/app/domain/cytoscape-style.js  |  10 +-
 .../resources/ui/app/domain/mapping-utils.js    |  20 +-
 .../resources/ui/app/domain/schema-versions.js  |   4 +-
 .../main/resources/ui/app/domain/sla-info.js    |  12 +-
 .../ui/app/domain/workflow-importer.js          |   2 +-
 .../ui/app/domain/workflow-json-importer.js     |   9 +-
 .../main/resources/ui/app/domain/workflow.js    |  11 +-
 .../ui/app/routes/design/proj-manager-tab.js    |   2 +-
 .../src/main/resources/ui/app/routes/index.js   |   9 +-
 .../main/resources/ui/app/services/user-info.js |   2 +-
 .../ui/app/services/workspace-manager.js        |  23 +-
 .../app/templates/components/bundle-config.hbs  |  11 +-
 .../app/templates/components/coord-config.hbs   |  13 +-
 .../templates/components/designer-errors.hbs    |   2 +-
 .../app/templates/components/flow-designer.hbs  |  15 +-
 .../ui/app/templates/components/hive-action.hbs |  23 +-
 .../app/templates/components/hive2-action.hbs   |  41 +-
 .../ui/app/templates/components/java-action.hbs |  19 +-
 .../app/templates/components/search-table.hbs   |  15 +-
 .../ui/app/templates/components/sla-info.hbs    |  12 +-
 .../app/templates/components/sqoop-action.hbs   |  40 +-
 .../ui/app/templates/components/ssh-action.hbs  |   7 +-
 .../components/workflow-job-action.hbs          |  30 ++
 .../components/workflow-job-details.hbs         |  24 +-
 .../main/resources/ui/app/templates/index.hbs   |   5 +-
 .../main/resources/ui/app/utils/common-utils.js |  18 +
 .../resources/ui/app/validators/arg-length.js   |  46 ++
 .../app/validators/duplicate-data-node-name.js  |  20 +-
 .../app/validators/duplicate-kill-node-name.js  |  28 +-
 .../components/workflow-job-action-test.js      |  40 ++
 docs/pom.xml                                    |  12 +
 pom.xml                                         |   1 +
 397 files changed, 9210 insertions(+), 1828 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/f6bc7979/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/ambari/blob/f6bc7979/ambari-server/src/main/resources/properties.json
----------------------------------------------------------------------