You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rl...@apache.org on 2017/10/03 20:15:54 UTC
[07/22] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-20859
Merge branch 'trunk' into branch-feature-AMBARI-20859
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f36413f8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f36413f8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f36413f8
Branch: refs/heads/branch-feature-AMBARI-20859
Commit: f36413f8bbde11f3ffbb22e969e5ff248cd7fc0a
Parents: 17243c6 6d51e01
Author: Robert Levas <rl...@hortonworks.com>
Authored: Mon Oct 2 16:44:48 2017 -0400
Committer: Robert Levas <rl...@hortonworks.com>
Committed: Mon Oct 2 16:44:48 2017 -0400
----------------------------------------------------------------------
.../ambari_agent/CustomServiceOrchestrator.py | 6 +-
.../upgrade/HostVersionOutOfSyncListener.java | 4 +
.../orm/entities/RepositoryVersionEntity.java | 34 ++---
.../org/apache/ambari/server/state/Host.java | 17 +++
.../ambari/server/state/host/HostImpl.java | 43 +++++++
.../svccomphost/ServiceComponentHostImpl.java | 9 +-
.../ServiceComponentHostSummary.java | 123 -------------------
.../HIVE/configuration/llap-daemon-log4j.xml | 2 +-
.../upgrade/StackVersionListenerTest.java | 1 -
.../apache/ambari/server/orm/OrmTestHelper.java | 2 +-
.../svccomphost/ServiceComponentHostTest.java | 102 ++++++++++++++-
ambari-web/app/routes/add_kerberos_routes.js | 22 ++--
.../stack_upgrade/upgrade_version_box_view.js | 14 ++-
.../upgrade_version_box_view_test.js | 4 +-
14 files changed, 215 insertions(+), 168 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/f36413f8/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
----------------------------------------------------------------------