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/23248b36 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/23248b36 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/23248b36 Branch: refs/heads/2.4.0-maint Commit: 23248b36aaba6cadc3ee86cdbfe757a9bc23e245 Parents: 6c3ae83 82f7796 Author: Jenkins <[email protected]> Authored: Thu Aug 18 18:25:55 2016 +0000 Committer: Jenkins <[email protected]> Committed: Thu Aug 18 18:25:55 2016 +0000 ---------------------------------------------------------------------- .../stacks/HDP/2.3/services/stack_advisor.py | 2 +- .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 17 ----------------- .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 14 +------------- .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 1 + 4 files changed, 3 insertions(+), 31 deletions(-) ----------------------------------------------------------------------
