GitHub user JoshRosen opened a pull request:

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

    Improvements to merge_spark_pr.py

    This commit fixes a couple of issues in the merge_spark_pr.py developer 
script:
    
    - Allow recovery from failed cherry-picks.
    - Fix detection of pull requests that have already been merged.
    
    Both of these fixes are useful when backporting changes.

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

    $ git pull https://github.com/JoshRosen/spark pr-script-improvements

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

    https://github.com/apache/spark/pull/1668.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 #1668
    
----
commit ed5bc5753d47daf7271830ee6ffbbe0a55a83ba4
Author: Josh Rosen <[email protected]>
Date:   2014-07-30T19:16:55Z

    Improvements for backporting using merge_spark_pr:
    
    Allow users to recover from errors while cherry-picking.
    
    Fix detection of PRs that have already been merged.

----


---
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