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/b9058c4f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b9058c4f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b9058c4f Branch: refs/heads/AMBARI-2.4.0.2 Commit: b9058c4f8027c7f06d608847624ccd7e5b31d7cd Parents: 585cb45 85ba0ef Author: Jenkins <[email protected]> Authored: Sun Aug 21 04:45:59 2016 +0000 Committer: Jenkins <[email protected]> Committed: Sun Aug 21 04:45:59 2016 +0000 ---------------------------------------------------------------------- .../OOZIE/4.0.0.2.0/package/scripts/oozie_service.py | 2 +- .../src/test/python/stacks/2.0.6/OOZIE/test_oozie_server.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------
