-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviews.apache.org/r/48651/#review137765
-----------------------------------------------------------



Can you rebase patch to latest in trunk and submit the patch

git apply ~/Downloads/AMBARI-16864.patch
/Users/jluniya/Downloads/AMBARI-16864.patch:1114: trailing whitespace.
        "spark-javaopts-properties": {},
/Users/jluniya/Downloads/AMBARI-16864.patch:1125: trailing whitespace.
    },
/Users/jluniya/Downloads/AMBARI-16864.patch:1127: trailing whitespace.
        "service_package_folder": "common-services/SPARK/1.2.1/package",
/Users/jluniya/Downloads/AMBARI-16864.patch:1128: trailing whitespace.
        "script": "scripts/job_history_server.py",
/Users/jluniya/Downloads/AMBARI-16864.patch:1129: trailing whitespace.
        "hooks_folder": "HDP/2.0.6/hooks",
error: patch failed: 
ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py:156
error: 
ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py:
 patch does not apply

- Jayush Luniya


On June 13, 2016, 4:28 p.m., Saisai Shao wrote:
> 
> -----------------------------------------------------------
> This is an automatically generated e-mail. To reply, visit:
> https://reviews.apache.org/r/48651/
> -----------------------------------------------------------
> 
> (Updated June 13, 2016, 4:28 p.m.)
> 
> 
> Review request for Ambari and Jayush Luniya.
> 
> 
> Bugs: AMBARI-16864
>     https://issues.apache.org/jira/browse/AMBARI-16864
> 
> 
> Repository: ambari
> 
> 
> Description
> -------
> 
> Add unit tests for Spark2 service definition
> 
> 
> Diffs
> -----
> 
>   
> ambari-common/src/main/python/resource_management/libraries/functions/constants.py
>  7e85115 
>   
> ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/params.py
>  6925ab5 
>   
> ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_client.py
>  2c19b88 
>   
> ambari-server/src/main/resources/common-services/SPARK2/2.0.0/package/scripts/spark_service.py
>  c2385df 
>   
> ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_features.json
>  8ad53da 
>   ambari-server/src/test/python/stacks/2.5/SPARK2/test_job_history_server.py 
> PRE-CREATION 
>   ambari-server/src/test/python/stacks/2.5/SPARK2/test_spark_client.py 
> PRE-CREATION 
>   ambari-server/src/test/python/stacks/2.5/SPARK2/test_spark_service_check.py 
> PRE-CREATION 
>   ambari-server/src/test/python/stacks/2.5/SPARK2/test_spark_thrift_server.py 
> PRE-CREATION 
>   ambari-server/src/test/python/stacks/2.5/configs/secured.json PRE-CREATION 
>   
> ambari-server/src/test/python/stacks/2.5/configs/spark2-job-history-server.json
>  PRE-CREATION 
>   ambari-server/src/test/python/stacks/2.5/configs/spark2_default.json 
> PRE-CREATION 
>   ambari-server/src/test/python/stacks/2.5/configs/spark2_thriftserver.json 
> PRE-CREATION 
> 
> Diff: https://reviews.apache.org/r/48651/diff/
> 
> 
> Testing
> -------
> 
> Local unit test is done.
> 
> 
> Thanks,
> 
> Saisai Shao
> 
>

Reply via email to