ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nc...@apache.org
Subject [11/11] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade
Date Mon, 19 Sep 2016 15:32:02 GMT
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/79e67865
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/79e67865
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/79e67865

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 79e678653eff30ca07cc5c76ee6901d763a7566d
Parents: e2085dd d1ac8bd
Author: Nate Cole <ncole@hortonworks.com>
Authored: Mon Sep 19 11:31:36 2016 -0400
Committer: Nate Cole <ncole@hortonworks.com>
Committed: Mon Sep 19 11:31:36 2016 -0400

----------------------------------------------------------------------
 .../src/main/python/ambari_agent/Controller.py  |  18 ++-
 .../src/main/python/core/config_reader.py       |  12 +-
 .../eventcreator/RequestEventCreator.java       |  30 ++++-
 .../ambari/server/stack/ComponentModule.java    |   3 +
 .../ambari/server/state/ComponentInfo.java      |   2 +-
 .../package/templates/metric_monitor.ini.j2     |   1 +
 .../hadoop-metrics2.properties.xml              | 125 +++++++++++++++++++
 .../2.0.6/hooks/before-START/scripts/params.py  |   3 +-
 .../scripts/shared_initialization.py            |  18 ++-
 .../creator/RequestEventCreatorTest.java        |  27 ++++
 .../server/stack/ComponentModuleTest.java       |  15 ++-
 .../python/stacks/2.0.6/configs/default.json    |   3 +
 .../python/stacks/2.0.6/configs/secured.json    |   3 +
 .../hooks/before-START/test_before_start.py     |   8 +-
 ambari-web/app/models/host_component.js         |   4 +-
 .../8.0.0/package/scripts/service_check.py      |   1 +
 .../MICROSOFT_R/8.0.0/role_command_order.json   |   6 +
 contrib/version-builder/example.py              |   4 +-
 contrib/version-builder/example.sh              |   4 +-
 contrib/version-builder/version_builder.py      |  12 +-
 .../ambari/view/hive2/ConnectionSystem.java     |  23 ++--
 21 files changed, 281 insertions(+), 41 deletions(-)
----------------------------------------------------------------------



Mime
View raw message