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/408354f5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/408354f5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/408354f5 Branch: refs/heads/2.4.0-maint Commit: 408354f5704b23f2b7becfa372c9e99d9408e843 Parents: 0392db4 86febaa Author: Jenkins <[email protected]> Authored: Thu Aug 18 15:01:00 2016 +0000 Committer: Jenkins <[email protected]> Committed: Thu Aug 18 15:01:00 2016 +0000 ---------------------------------------------------------------------- .../stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py | 1 + .../stacks/HDP/2.3/services/HDFS/configuration/hadoop-env.xml | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
