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/d57bab51 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d57bab51 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d57bab51 Branch: refs/heads/branch-feature-AMBARI-20859 Commit: d57bab51c7b7cdd5dd9abe6289e27eeaf21930fc Parents: 07e50d8 639f452 Author: Robert Levas <[email protected]> Authored: Tue Jul 11 05:05:59 2017 -0400 Committer: Robert Levas <[email protected]> Committed: Tue Jul 11 05:05:59 2017 -0400 ---------------------------------------------------------------------- .../ambari/server/topology/AmbariContext.java | 81 +++++++++++++++----- 1 file changed, 62 insertions(+), 19 deletions(-) ----------------------------------------------------------------------
