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/c7d812e6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c7d812e6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c7d812e6 Branch: refs/heads/AMBARI-2.4.0.2 Commit: c7d812e6236abc7bd76f770928d46aee088478f3 Parents: eeb3c79 3689a8d Author: Jenkins <jenk...@hortonworks.com> Authored: Mon Aug 22 18:36:00 2016 +0000 Committer: Jenkins <jenk...@hortonworks.com> Committed: Mon Aug 22 18:36:00 2016 +0000 ---------------------------------------------------------------------- .../0.6.0.2.5/package/scripts/params.py | 1 + .../0.6.0.2.5/package/scripts/service_check.py | 3 ++- ambari-web/pom.xml | 28 ++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) ----------------------------------------------------------------------