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/23eb3fd8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/23eb3fd8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/23eb3fd8 Branch: refs/heads/2.4.0-maint Commit: 23eb3fd802305bdb226c1402d807561b3844980b Parents: a480434 3643111 Author: Jenkins <[email protected]> Authored: Thu Aug 18 23:11:23 2016 +0000 Committer: Jenkins <[email protected]> Committed: Thu Aug 18 23:11:23 2016 +0000 ---------------------------------------------------------------------- .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 14 +++---- .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 14 +++---- .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 14 +++---- .../stacks/HDP/2.4/upgrades/upgrade-2.4.xml | 30 +++++++-------- .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 40 ++++++++++---------- .../services/HIVE/configuration/hive-site.xml | 1 + .../stacks/HDP/2.5/upgrades/upgrade-2.5.xml | 31 +++++++-------- 7 files changed, 73 insertions(+), 71 deletions(-) ----------------------------------------------------------------------
