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/03 20:14:30 UTC
[16/16] 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/c72dc41d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c72dc41d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c72dc41d
Branch: refs/heads/branch-dev-patch-upgrade
Commit: c72dc41db25fe5898fe7dc36d1aa3bdaf4d0fc5d
Parents: 4c5d2bd 424cca6
Author: Nate Cole <nc...@hortonworks.com>
Authored: Wed Feb 3 14:14:07 2016 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Wed Feb 3 14:14:07 2016 -0500
----------------------------------------------------------------------
.../app/scripts/controllers/NavbarCtrl.js | 9 +
.../authentication/AuthenticationMainCtrl.js | 147 ++++++++++-
.../loginActivities/LoginMessageMainCtrl.js | 59 ++++-
.../ui/admin-web/app/scripts/i18n.config.js | 82 +++++-
.../resources/ui/admin-web/app/styles/main.css | 42 +++-
.../app/views/authentication/main.html | 250 ++++++++++++++++++-
.../ui/admin-web/app/views/leftNavbar.html | 4 +-
.../app/views/loginActivities/loginMessage.html | 74 ++++--
.../ui/admin-web/app/views/users/create.html | 2 +-
ambari-agent/conf/unix/install-helper.sh | 40 ++-
.../src/main/package/deb/control/postinst | 12 +-
.../src/main/package/deb/control/posttrm | 15 --
ambari-agent/src/main/package/deb/control/prerm | 8 -
.../src/main/package/rpm/postinstall.sh | 19 +-
ambari-agent/src/main/package/rpm/preremove.sh | 8 -
.../ambari_agent/CustomServiceOrchestrator.py | 11 +-
.../main/python/ambari_agent/PythonExecutor.py | 14 +-
.../ambari_agent/PythonReflectiveExecutor.py | 5 +-
ambari-agent/src/packages/tarball/all.xml | 4 +-
.../timeline/AbstractTimelineMetricsSink.java | 4 +-
.../metrics2/sink/timeline/TimelineMetric.java | 13 +-
.../sink/timeline/TimelineMetricMetadata.java | 15 +-
.../timeline/cache/TimelineMetricsCache.java | 9 +-
.../sink/flume/FlumeTimelineMetricsSink.java | 7 +-
.../timeline/HadoopTimelineMetricsSink.java | 6 +-
.../timeline/HadoopTimelineMetricsSinkTest.java | 5 +-
.../kafka/KafkaTimelineMetricsReporter.java | 16 +-
.../storm/StormTimelineMetricsReporter.java | 2 -
.../timeline/HBaseTimelineMetricStore.java | 19 +-
.../metrics/timeline/PhoenixHBaseAccessor.java | 111 +++-----
.../metrics/timeline/aggregators/Function.java | 75 ++++--
.../aggregators/TimelineMetricReadHelper.java | 38 +++
.../TimelineMetricMetadataManager.java | 5 +-
.../metrics/timeline/FunctionTest.java | 10 +-
.../timeline/HBaseTimelineMetricStoreTest.java | 31 ++-
ambari-server/conf/unix/install-helper.sh | 48 +++-
ambari-server/src/main/assemblies/server.xml | 2 +-
.../upgrades/FinalizeUpgradeAction.java | 23 +-
.../src/main/package/deb/control/postinst | 10 +-
.../src/main/package/deb/control/posttrm | 15 --
.../src/main/package/deb/control/prerm | 18 +-
.../src/main/package/rpm/postinstall.sh | 8 +-
ambari-server/src/main/package/rpm/preremove.sh | 18 +-
.../configuration/application-properties.xml | 36 ++-
.../ATLAS/0.1.0.2.3/metainfo.xml | 4 +
.../ATLAS/0.1.0.2.3/package/scripts/params.py | 11 +
.../common-services/HAWQ/2.0.0/alerts.json | 19 ++
.../2.0.0/package/alerts/alert_sync_status.py | 91 +++++++
.../HAWQ/2.0.0/package/scripts/service_check.py | 22 +-
.../HAWQ/2.0.0/package/scripts/utils.py | 4 +-
.../HIVE/0.12.0.2.0/configuration/hive-env.xml | 2 +
.../0.12.0.2.0/package/scripts/params_linux.py | 2 +
.../PXF/3.0.0/package/scripts/params.py | 6 +-
.../PXF/3.0.0/package/scripts/pxf_constants.py | 1 +
.../PXF/3.0.0/package/scripts/service_check.py | 101 +++++---
.../services/HIVE/configuration/hive-env.xml | 2 +
.../upgrades/UpgradeActionTest.java | 160 ++++++++++--
.../stacks/2.3/HAWQ/test_alert_sync_status.py | 194 ++++++++++++++
.../test/python/stacks/2.3/configs/default.json | 9 +-
ambari-web/app/assets/data/clusters/info.json | 11 -
ambari-web/app/assets/data/settings/motd.json | 10 +
.../main/admin/stack_and_upgrade_controller.js | 2 +
.../alerts/definition_configs_controller.js | 29 +++
.../app/mappers/alert_definitions_mapper.js | 36 +--
ambari-web/app/messages.js | 1 +
ambari-web/app/models/alerts/alert_config.js | 62 ++++-
.../app/models/alerts/alert_definition.js | 4 +-
ambari-web/app/models/upgrade_entity.js | 2 +-
ambari-web/app/router.js | 41 +++
ambari-web/app/styles/alerts.less | 4 +
.../alerts/configs/alert_config_parameter.hbs | 33 +++
ambari-web/app/utils/ajax/ajax.js | 4 +
ambari-web/app/views/common/table_view.js | 16 +-
.../main/alerts/definition_configs_view.js | 10 +
.../admin/stack_and_upgrade_controller_test.js | 17 ++
.../definitions_configs_controller_test.js | 44 +++-
.../mappers/alert_definitions_mapper_test.js | 45 +++-
.../test/models/alerts/alert_config_test.js | 100 ++++++++
78 files changed, 2001 insertions(+), 447 deletions(-)
----------------------------------------------------------------------