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 2016/02/01 16:42:16 UTC
[39/39] 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/73aee31e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/73aee31e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/73aee31e
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 73aee31ef67348bbfc942bdf719c6952964a82ab
Parents: e7bdb7b 3ab6a3a
Author: Nate Cole <nc...@hortonworks.com>
Authored: Mon Feb 1 10:41:26 2016 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Mon Feb 1 10:41:26 2016 -0500
----------------------------------------------------------------------
.../main/resources/ui/admin-web/app/index.html | 1 +
.../controllers/clusters/UserAccessListCtrl.js | 2 +-
.../loginActivities/LoginMessageMainCtrl.js | 67 ++
.../ui/admin-web/app/scripts/i18n.config.js | 6 +-
.../resources/ui/admin-web/app/styles/main.css | 6 +
.../app/views/clusters/userAccessList.html | 4 +-
.../app/views/loginActivities/loginMessage.html | 50 +-
ambari-agent/conf/unix/ambari-agent | 13 +
ambari-agent/etc/init/ambari-agent.conf | 34 +
ambari-agent/pom.xml | 479 +---------
ambari-agent/src/packages/tarball/all.xml | 168 +++-
.../resource_management/core/global_lock.py | 46 +
.../libraries/functions/curl_krb_request.py | 47 +-
.../libraries/functions/hive_check.py | 23 +-
.../sink/timeline/MetadataException.java | 28 +
.../sink/timeline/TimelineMetricMetadata.java | 163 ++++
.../timeline/HBaseTimelineMetricStore.java | 73 +-
.../metrics/timeline/PhoenixHBaseAccessor.java | 253 +++++-
.../timeline/TimelineMetricConfiguration.java | 9 +
.../metrics/timeline/TimelineMetricStore.java | 22 +-
.../TimelineMetricAggregatorFactory.java | 5 +-
.../TimelineMetricAppAggregator.java | 28 +-
.../TimelineMetricClusterAggregatorSecond.java | 5 +-
.../discovery/TimelineMetricMetadataKey.java | 56 ++
.../TimelineMetricMetadataManager.java | 187 ++++
.../discovery/TimelineMetricMetadataSync.java | 105 +++
.../timeline/query/PhoenixTransactSQL.java | 37 +-
.../webapp/TimelineWebServices.java | 59 +-
.../TestApplicationHistoryServer.java | 11 +-
.../timeline/AbstractMiniHBaseClusterTest.java | 8 +-
.../timeline/ITPhoenixHBaseAccessor.java | 9 +-
.../timeline/TestTimelineMetricStore.java | 14 +
.../aggregators/ITClusterAggregator.java | 16 +-
.../timeline/discovery/TestMetadataManager.java | 112 +++
ambari-server/pom.xml | 883 +------------------
ambari-server/src/main/assemblies/server.xml | 348 ++++++--
.../internal/AdminSettingResourceProvider.java | 5 +
.../AlertDefinitionResourceProvider.java | 4 +-
.../internal/AlertResourceProvider.java | 6 +-
.../AmbariAuthorizationFilter.java | 3 +-
.../server/upgrade/UpgradeCatalog210.java | 4 +-
.../server/upgrade/UpgradeCatalog221.java | 8 +
.../server/upgrade/UpgradeCatalog222.java | 15 +
.../HAWQ/2.0.0/configuration/hawq-site.xml | 14 +
.../package/alerts/alert_hive_metastore.py | 15 +-
.../package/alerts/alert_webhcat_server.py | 6 -
.../package/alerts/alert_check_oozie_server.py | 15 +-
.../OOZIE/4.0.0.2.0/package/scripts/oozie.py | 2 +-
.../SPARK/1.2.0.2.2/package/scripts/params.py | 2 +-
.../YARN/2.1.0.2.0/kerberos.json | 4 +-
.../services/HIVE/configuration/hive-site.xml | 2 -
.../stacks/HDP/2.2/services/YARN/kerberos.json | 4 +-
.../HDP/2.3/services/ACCUMULO/widgets.json | 4 +-
.../stacks/HDP/2.3/services/YARN/kerberos.json | 4 +-
.../stacks/HDP/2.3/services/stack_advisor.py | 9 +-
.../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 5 +
.../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 80 +-
.../SPARK/configuration/spark-defaults.xml | 4 +-
.../configuration/spark-thrift-sparkconf.xml | 31 +-
.../stacks/HDP/2.4/upgrades/config-upgrade.xml | 26 +-
.../AdminSettingResourceProviderTest.java | 15 +-
.../server/orm/dao/AdminSettingDAOTest.java | 4 +
.../ambari/server/orm/dao/AlertsDAOTest.java | 38 +
.../server/upgrade/UpgradeCatalog221Test.java | 47 +
.../server/upgrade/UpgradeCatalog222Test.java | 6 +-
ambari-server/src/test/python/TestGlobalLock.py | 55 ++
.../stacks/2.0.6/OOZIE/test_oozie_client.py | 6 +-
.../stacks/2.0.6/OOZIE/test_oozie_server.py | 117 ++-
.../stacks/2.0.6/OOZIE/test_service_check.py | 4 -
.../common/services-normal-hawq-3-hosts.json | 11 +
.../stacks/2.3/common/test_stack_advisor.py | 34 +
ambari-server/src/test/python/unitTests.py | 14 +-
.../main/admin/stack_and_upgrade_controller.js | 22 +-
.../main/alert_definitions_controller.js | 41 +
.../controllers/main/host/combo_search_box.js | 30 +-
ambari-web/app/controllers/main/service/item.js | 2 +-
.../app/controllers/wizard/step0_controller.js | 2 +-
.../app/controllers/wizard/step3_controller.js | 3 +-
.../app/controllers/wizard/step7_controller.js | 2 +-
.../mappers/alert_definition_summary_mapper.js | 8 +-
ambari-web/app/messages.js | 2 +
.../main/service/configs/config_overridable.js | 3 +-
.../app/models/alerts/alert_definition.js | 1 +
ambari-web/app/models/host_component.js | 3 +-
ambari-web/app/models/service.js | 43 +
.../stack_upgrade/stack_upgrade_wizard.hbs | 8 +-
ambari-web/app/templates/main/alerts.hbs | 32 +-
.../alert_definition/alert_definition_state.hbs | 31 +
.../alert_definition_summary.hbs | 28 +
ambari-web/app/utils/ajax/ajax.js | 19 +
ambari-web/app/utils/ember_reopen.js | 14 +
ambari-web/app/utils/validator.js | 2 +-
ambari-web/app/views.js | 2 +
.../app/views/common/quick_view_link_view.js | 3 +
ambari-web/app/views/common/sort_view.js | 19 +-
ambari-web/app/views/common/table_view.js | 24 +-
.../app/views/main/alert_definitions_view.js | 23 +-
.../alert_definition/alert_definition_state.js | 34 +
.../alert_definition_summary.js | 65 ++
.../views/main/dashboard/config_history_view.js | 12 +
.../app/views/main/host/combo_search_box.js | 1 +
.../test/controllers/main/service/item_test.js | 13 +-
ambari-web/test/utils/validator_test.js | 1 +
.../test/views/common/quick_link_view_test.js | 5 +
ambari-web/vendor/scripts/visualsearch.js | 2 +-
105 files changed, 2726 insertions(+), 1774 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/73aee31e/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog221.java
----------------------------------------------------------------------