Skip to content

Conversation

@liancheng
Copy link
Contributor

It's a common case that some contributor contributes an initial version of a feature/bugfix, and later on some other people (mostly committers) fork and add more improvements. When merging these PRs, we probably want to specify the original author as the primary author. Currently we can only do this by running

$ git commit --amend --author="name <email>"

manually right before the merge script pushes to Apache Git repo. It would be nice if the script accepts user specified primary author information.

@srowen
Copy link
Member

srowen commented Jul 19, 2015

LGTM. Several superfluous whitespace changes, but hey.

@liancheng
Copy link
Contributor Author

@srowen Thanks for the review :) Just couldn't help to remove those trailing spaces... I'm merging this to master then.

@asfgit asfgit closed this in bc24289 Jul 19, 2015
@liancheng liancheng deleted the spark-9179 branch July 19, 2015 09:39
@SparkQA
Copy link

SparkQA commented Jul 19, 2015

Test build #37767 has finished for PR 7508 at commit 218d88e.

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

liancheng referenced this pull request Jul 20, 2015
…or partition pruning

This PR forks PR #7421 authored by piaozhexiu and adds [a workaround] [1] for fixing the occasional test failures occurred in PR #7421. Please refer to these [two] [2] [comments] [3] for details.

[1]: liancheng@536ac41
[2]: #7421 (comment)
[3]: #7421 (comment)

Author: Cheolsoo Park <cheolsoop@netflix.com>
Author: Cheng Lian <lian@databricks.com>
Author: Michael Armbrust <michael@databricks.com>

Closes #7492 from liancheng/pr-7421-workaround and squashes the following commits:

5599cc4 [Cheolsoo Park] Predicate pushdown to hive metastore
536ac41 [Cheng Lian] Sets hive.metastore.integral.jdo.pushdown to true to workaround test failures caused by in #7421
@shivaram
Copy link
Contributor

@liancheng There is one minor issue with this change -- the default value for the author is never picked up if we don't enter anything i.e. after the raw_input, we should check if the input was "" and if so just use the default_author ?

asfgit pushed a commit that referenced this pull request Jul 21, 2015
Fixes feature introduced in #7508 to use the default value if nothing is specified in command line

cc liancheng rxin pwendell

Author: Shivaram Venkataraman <shivaram@cs.berkeley.edu>

Closes #7558 from shivaram/merge-script-fix and squashes the following commits:

7092141 [Shivaram Venkataraman] Use default primary author if unspecified
@liancheng
Copy link
Contributor Author

@shivaram Yeah, thanks for pointing this out and fixing it in #7558!

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