Merge branch 'branch-feature-AMBARI-21348' into branch-2.5
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/da44c5c1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/da44c5c1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/da44c5c1 Branch: refs/heads/branch-2.5 Commit: da44c5c1a5476b78887cd7729d0efc5afbf0dae9 Parents: a6ac40b 267cd8b Author: Jonathan Hurley <jhur...@hortonworks.com> Authored: Wed Jul 12 14:47:40 2017 -0400 Committer: Jonathan Hurley <jhur...@hortonworks.com> Committed: Wed Jul 12 14:47:40 2017 -0400 ---------------------------------------------------------------------- .../ambari/server/controller/internal/UpgradeResourceProvider.java | 2 ++ 1 file changed, 2 insertions(+) ----------------------------------------------------------------------
