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/10/03 17:51:41 UTC
[6/6] 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/e6d8cd11
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e6d8cd11
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e6d8cd11
Branch: refs/heads/branch-dev-patch-upgrade
Commit: e6d8cd119f9aaecbc6de33b5784d4cf2906ad53b
Parents: 806723e f2bcbbe
Author: Nate Cole <nc...@hortonworks.com>
Authored: Mon Oct 3 13:51:21 2016 -0400
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Mon Oct 3 13:51:21 2016 -0400
----------------------------------------------------------------------
.../ui/admin-web/app/views/groups/edit.html | 4 ++--
ambari-agent/conf/unix/ambari-agent.ini | 1 +
.../src/main/python/ambari_agent/ActionQueue.py | 22 ++++++++++++++++-
.../src/main/python/ambari_agent/HostCleanup.py | 6 ++---
.../ambari_agent/PythonReflectiveExecutor.py | 25 +++++++++++++++-----
.../test/python/ambari_agent/TestActionQueue.py | 3 ++-
.../app/views/common/chart/linear_time.js | 2 +-
7 files changed, 49 insertions(+), 14 deletions(-)
----------------------------------------------------------------------