Merge remote-tracking branch 'origin/apache-ref/branch-2.4' into 2.4.0-maint
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0392db49 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0392db49 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0392db49 Branch: refs/heads/2.4.0-maint Commit: 0392db4969ac96e66f8bce6d9eac2a3f2a100bc0 Parents: a7d63b7 e8215fd Author: Jenkins <[email protected]> Authored: Thu Aug 18 14:16:10 2016 +0000 Committer: Jenkins <[email protected]> Committed: Thu Aug 18 14:16:10 2016 +0000 ---------------------------------------------------------------------- .../resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 13 ++++++++++++- .../resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 1 - 2 files changed, 12 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
