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/a4804342 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a4804342 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a4804342 Branch: refs/heads/2.4.0-maint Commit: a4804342a05ebfd111370caeaf812e6129ff1ad0 Parents: 0ec890b 5511642 Author: Jenkins <[email protected]> Authored: Thu Aug 18 21:10:56 2016 +0000 Committer: Jenkins <[email protected]> Committed: Thu Aug 18 21:10:56 2016 +0000 ---------------------------------------------------------------------- .../SPARK/1.2.1/package/scripts/spark_service.py | 5 +++++ .../SPARK2/2.0.0/package/scripts/spark_service.py | 5 +++++ 2 files changed, 10 insertions(+) ----------------------------------------------------------------------
