GitHub user EugenCepoi opened a pull request:

    https://github.com/apache/spark/pull/997

    SPARK-2058: Overriding config from SPARK_HOME with SPARK_CONF_DIR

    Fixes https://issues.apache.org/jira/browse/SPARK-2058
    
    The general idea is to use SPARK_CONF_DIR content instead of 
SPARK_HOME/conf when defined.
    
     - When SPARK_CONF_DIR is defined, spark-defaults.conf will be loaded from 
there. 
     - SPARK_CONF_DIR is added to the classpath, overriding the default conf 
from SPARK_HOME/conf

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/EugenCepoi/spark branch-1.0

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/spark/pull/997.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #997
    
----
commit 5ede2c097802261bbe4749c14d56e1e8fb82a626
Author: EugenCepoi <[email protected]>
Date:   2014-06-06T10:03:06Z

    SPARK-2058: use spark-defaults.conf from SPARK_CONF_DIR when defined

commit 96e3fdd565466583898cba3d0dffc770a728efc1
Author: EugenCepoi <[email protected]>
Date:   2014-06-06T10:04:01Z

    SPARK-2058: override the classpath with SPARK_CONF_DIR

commit 69d337ef8bef44f449b14ee2fb3ee61e1bf6c0b8
Author: EugenCepoi <[email protected]>
Date:   2014-06-06T13:19:00Z

    fixing typo in compute-classpath.sh

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at [email protected] or file a JIRA ticket
with INFRA.
---

Reply via email to