Skip to content

Conversation

@srowen
Copy link
Member

@srowen srowen commented Oct 12, 2016

Closes #15303
Closes #15078
Closes #15080
Closes #15135
Closes #14565
Closes #12355
Closes #15404

@SparkQA
Copy link

SparkQA commented Oct 12, 2016

Test build #66817 has finished for PR 15451 at commit 4d40636.

  • This patch passes all tests.
  • This patch merges cleanly.
  • This patch adds no public classes.

@rxin
Copy link
Contributor

rxin commented Oct 12, 2016

Merging in master.

@rxin
Copy link
Contributor

rxin commented Oct 12, 2016

Actually I'm getting error when merging. Not sure why.

@vanzin
Copy link
Contributor

vanzin commented Oct 12, 2016

Let me try...

@vanzin
Copy link
Contributor

vanzin commented Oct 12, 2016

Done. I had to temporarily add --allow-empty to the git commit command in ./dev/merge_spark_pr.py. Perhaps we should fix the script to always add that option (or have some command line switch for it).

@asfgit asfgit closed this in eb69335 Oct 12, 2016
@srowen
Copy link
Member Author

srowen commented Oct 12, 2016

Yes you have to add --allow-empty temporarily. I hadn't added it to the script because usually we don't want to allow an empty commit. Yes if this becomes pretty regular, probably worth some kind of check and prompt during the script that would allow this to proceed without temporarily changing the script.

@srowen srowen deleted the CloseStalePRs branch October 12, 2016 20:30
zifeif2 pushed a commit to zifeif2/spark that referenced this pull request Nov 22, 2025
Closes apache#15303
Closes apache#15078
Closes apache#15080
Closes apache#15135
Closes apache#14565
Closes apache#12355
Closes apache#15404

Author: Sean Owen <[email protected]>

Closes apache#15451 from srowen/CloseStalePRs.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants