You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by GitBox <gi...@apache.org> on 2020/08/12 21:45:13 UTC
[GitHub] [spark-website] holdenk opened a new pull request #284: Update committer guide
holdenk opened a new pull request #284:
URL: https://github.com/apache/spark-website/pull/284
Update the committer guide with the new policy we voted on for when to commit.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] HyukjinKwon commented on a change in pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on a change in pull request #284:
URL: https://github.com/apache/spark-website/pull/284#discussion_r469653695
##########
File path: committers.md
##########
@@ -132,6 +132,27 @@ In particular, if you are working on an area of the codebase you are unfamiliar
Git history for that code to see who reviewed patches before. You can do this using
`git log --format=full <filename>`, by examining the "Commit" field to see who committed each patch.
+<h3>When to commit/merge a pull request</h3>
+
+PRs shall not be merged during active, on-topic discussion unless they address issues such as critical security fixes of a public vulnerability. Under extenuating circumstances, PRs may be merged during active, off-topic discussion and the discussion directed to a more appropriate venue. Time should be given prior to merging for those involved with the conversation to explain if they believe they are on-topic.
Review comment:
I think we can just say "for example 72 hours". That's [the example in the lazy consensus](https://www.apache.org/foundation/voting.html#LazyConsensus), and I believe we're rather clarifying and reiterating what ASF wrote there.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] HyukjinKwon edited a comment on pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
HyukjinKwon edited a comment on pull request #284:
URL: https://github.com/apache/spark-website/pull/284#issuecomment-673205825
Out of curiosity, why is it only in Spark website? I thought the general issue is https://www.apache.org/foundation/voting.html page itself isn't clear and we targeted to fix that page.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] dongjoon-hyun commented on pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on pull request #284:
URL: https://github.com/apache/spark-website/pull/284#issuecomment-679263615
Please merge this AS-IS.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] srowen commented on a change in pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
srowen commented on a change in pull request #284:
URL: https://github.com/apache/spark-website/pull/284#discussion_r469569177
##########
File path: site/committers.html
##########
@@ -613,9 +629,9 @@ <h4>Merge Script</h4>
<p>If you want to amend a commit before merging – which should be used for trivial touch-ups –
then simply let the script wait at the point where it asks you if you want to push to Apache.
-Then, in a separate window, modify the code and push a commit. Run <code class="highlighter-rouge">git rebase -i HEAD~2</code> and
+Then, in a separate window, modify the code and push a commit. Run <code class="language-plaintext highlighter-rouge">git rebase -i HEAD~2</code> and
Review comment:
Ha OK then your results are 'correct'; it had been previously generated with jekyll 3.x. I think it's fine to choose to revert those, or commit them. Really we should regenerate everything with jekyll 4.1.x and really ask people stick to the latest, and be done with it.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] holdenk commented on a change in pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
holdenk commented on a change in pull request #284:
URL: https://github.com/apache/spark-website/pull/284#discussion_r469570540
##########
File path: committers.md
##########
@@ -132,6 +132,27 @@ In particular, if you are working on an area of the codebase you are unfamiliar
Git history for that code to see who reviewed patches before. You can do this using
`git log --format=full <filename>`, by examining the "Commit" field to see who committed each patch.
+<h3>When to commit/merge a pull request</h3>
+
+PRs shall not be merged during active, on-topic discussion unless they address issues such as critical security fixes of a public vulnerability. Under extenuating circumstances, PRs may be merged during active, off-topic discussion and the discussion directed to a more appropriate venue. Time should be given prior to merging for those involved with the conversation to explain if they believe they are on-topic.
Review comment:
Or well we can but I'd prefer to take it to another vote first before changing the policy.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] srowen commented on a change in pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
srowen commented on a change in pull request #284:
URL: https://github.com/apache/spark-website/pull/284#discussion_r469567040
##########
File path: site/committers.html
##########
@@ -613,9 +629,9 @@ <h4>Merge Script</h4>
<p>If you want to amend a commit before merging – which should be used for trivial touch-ups –
then simply let the script wait at the point where it asks you if you want to push to Apache.
-Then, in a separate window, modify the code and push a commit. Run <code class="highlighter-rouge">git rebase -i HEAD~2</code> and
+Then, in a separate window, modify the code and push a commit. Run <code class="language-plaintext highlighter-rouge">git rebase -i HEAD~2</code> and
Review comment:
I think these other changes are coming from differences in jekyll version - are you using 4.1.x? Not a big deal but I am not sure everyone is and I usually revert the noise changes and one day we'll standardize!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] HyukjinKwon commented on pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on pull request #284:
URL: https://github.com/apache/spark-website/pull/284#issuecomment-673238384
The doc here looks good as we voted and discussed.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] holdenk commented on a change in pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
holdenk commented on a change in pull request #284:
URL: https://github.com/apache/spark-website/pull/284#discussion_r469585444
##########
File path: committers.md
##########
@@ -132,6 +132,27 @@ In particular, if you are working on an area of the codebase you are unfamiliar
Git history for that code to see who reviewed patches before. You can do this using
`git log --format=full <filename>`, by examining the "Commit" field to see who committed each patch.
+<h3>When to commit/merge a pull request</h3>
+
+PRs shall not be merged during active, on-topic discussion unless they address issues such as critical security fixes of a public vulnerability. Under extenuating circumstances, PRs may be merged during active, off-topic discussion and the discussion directed to a more appropriate venue. Time should be given prior to merging for those involved with the conversation to explain if they believe they are on-topic.
Review comment:
Sounds good to me then. So we can do something like "often at least 72 hours"?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] holdenk commented on pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
holdenk commented on pull request #284:
URL: https://github.com/apache/spark-website/pull/284#issuecomment-673126667
Change is:
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] holdenk commented on a change in pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
holdenk commented on a change in pull request #284:
URL: https://github.com/apache/spark-website/pull/284#discussion_r469567872
##########
File path: site/committers.html
##########
@@ -613,9 +629,9 @@ <h4>Merge Script</h4>
<p>If you want to amend a commit before merging – which should be used for trivial touch-ups –
then simply let the script wait at the point where it asks you if you want to push to Apache.
-Then, in a separate window, modify the code and push a commit. Run <code class="highlighter-rouge">git rebase -i HEAD~2</code> and
+Then, in a separate window, modify the code and push a commit. Run <code class="language-plaintext highlighter-rouge">git rebase -i HEAD~2</code> and
Review comment:
I'm running Jekyll 4.1.1
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] srowen commented on a change in pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
srowen commented on a change in pull request #284:
URL: https://github.com/apache/spark-website/pull/284#discussion_r469572616
##########
File path: committers.md
##########
@@ -132,6 +132,27 @@ In particular, if you are working on an area of the codebase you are unfamiliar
Git history for that code to see who reviewed patches before. You can do this using
`git log --format=full <filename>`, by examining the "Commit" field to see who committed each patch.
+<h3>When to commit/merge a pull request</h3>
+
+PRs shall not be merged during active, on-topic discussion unless they address issues such as critical security fixes of a public vulnerability. Under extenuating circumstances, PRs may be merged during active, off-topic discussion and the discussion directed to a more appropriate venue. Time should be given prior to merging for those involved with the conversation to explain if they believe they are on-topic.
Review comment:
I think minor clarifications are entirely fine. No need for a new vote.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] srowen commented on pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
srowen commented on pull request #284:
URL: https://github.com/apache/spark-website/pull/284#issuecomment-673207795
Sure bonus points for that. I think PMCs have this latitude to customize and specialize that generic guidance to their specific situations.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] dongjoon-hyun commented on a change in pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on a change in pull request #284:
URL: https://github.com/apache/spark-website/pull/284#discussion_r469616425
##########
File path: committers.md
##########
@@ -132,6 +132,27 @@ In particular, if you are working on an area of the codebase you are unfamiliar
Git history for that code to see who reviewed patches before. You can do this using
`git log --format=full <filename>`, by examining the "Commit" field to see who committed each patch.
+<h3>When to commit/merge a pull request</h3>
+
+PRs shall not be merged during active, on-topic discussion unless they address issues such as critical security fixes of a public vulnerability. Under extenuating circumstances, PRs may be merged during active, off-topic discussion and the discussion directed to a more appropriate venue. Time should be given prior to merging for those involved with the conversation to explain if they believe they are on-topic.
Review comment:
+1 for `often at least 72 hours`
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] HyukjinKwon commented on a change in pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on a change in pull request #284:
URL: https://github.com/apache/spark-website/pull/284#discussion_r469653695
##########
File path: committers.md
##########
@@ -132,6 +132,27 @@ In particular, if you are working on an area of the codebase you are unfamiliar
Git history for that code to see who reviewed patches before. You can do this using
`git log --format=full <filename>`, by examining the "Commit" field to see who committed each patch.
+<h3>When to commit/merge a pull request</h3>
+
+PRs shall not be merged during active, on-topic discussion unless they address issues such as critical security fixes of a public vulnerability. Under extenuating circumstances, PRs may be merged during active, off-topic discussion and the discussion directed to a more appropriate venue. Time should be given prior to merging for those involved with the conversation to explain if they believe they are on-topic.
Review comment:
I think we can just say "for example 72 hours". That's [the example in the lazy consensus](https://www.apache.org/foundation/voting.html#LazyConsensus), and I believe we're rather clarifying and reiterate what we wrote there here.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] holdenk commented on a change in pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
holdenk commented on a change in pull request #284:
URL: https://github.com/apache/spark-website/pull/284#discussion_r469570386
##########
File path: committers.md
##########
@@ -132,6 +132,27 @@ In particular, if you are working on an area of the codebase you are unfamiliar
Git history for that code to see who reviewed patches before. You can do this using
`git log --format=full <filename>`, by examining the "Commit" field to see who committed each patch.
+<h3>When to commit/merge a pull request</h3>
+
+PRs shall not be merged during active, on-topic discussion unless they address issues such as critical security fixes of a public vulnerability. Under extenuating circumstances, PRs may be merged during active, off-topic discussion and the discussion directed to a more appropriate venue. Time should be given prior to merging for those involved with the conversation to explain if they believe they are on-topic.
Review comment:
Ah, I don't think we can change the wording anymore since we voted on it.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] holdenk commented on pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
holdenk commented on pull request #284:
URL: https://github.com/apache/spark-website/pull/284#issuecomment-679259675
Ok I'm going to go ahead and commit, and if @dongjoon-hyun & @HyukjinKwon want to update with the 72 hours and can agree on the wording we can do that in a follow up PR.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] HyukjinKwon commented on a change in pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on a change in pull request #284:
URL: https://github.com/apache/spark-website/pull/284#discussion_r469653695
##########
File path: committers.md
##########
@@ -132,6 +132,27 @@ In particular, if you are working on an area of the codebase you are unfamiliar
Git history for that code to see who reviewed patches before. You can do this using
`git log --format=full <filename>`, by examining the "Commit" field to see who committed each patch.
+<h3>When to commit/merge a pull request</h3>
+
+PRs shall not be merged during active, on-topic discussion unless they address issues such as critical security fixes of a public vulnerability. Under extenuating circumstances, PRs may be merged during active, off-topic discussion and the discussion directed to a more appropriate venue. Time should be given prior to merging for those involved with the conversation to explain if they believe they are on-topic.
Review comment:
I think we can just say "for example 72 hours". That's [the example in the lazy consensus](https://www.apache.org/foundation/voting.html#LazyConsensus), and I believe we're rather clarifying and reiterating what ASF norms wrote there.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] dongjoon-hyun commented on a change in pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on a change in pull request #284:
URL: https://github.com/apache/spark-website/pull/284#discussion_r469570006
##########
File path: committers.md
##########
@@ -132,6 +132,27 @@ In particular, if you are working on an area of the codebase you are unfamiliar
Git history for that code to see who reviewed patches before. You can do this using
`git log --format=full <filename>`, by examining the "Commit" field to see who committed each patch.
+<h3>When to commit/merge a pull request</h3>
+
+PRs shall not be merged during active, on-topic discussion unless they address issues such as critical security fixes of a public vulnerability. Under extenuating circumstances, PRs may be merged during active, off-topic discussion and the discussion directed to a more appropriate venue. Time should be given prior to merging for those involved with the conversation to explain if they believe they are on-topic.
Review comment:
In this context, `Time should be given prior to merging`, can we have an example like 72 hour explicitly?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] asfgit closed pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
asfgit closed pull request #284:
URL: https://github.com/apache/spark-website/pull/284
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] HyukjinKwon commented on pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on pull request #284:
URL: https://github.com/apache/spark-website/pull/284#issuecomment-673205825
Out of curiosity, why is it only in Spark website? I thought the general issue is https://www.apache.org/foundation/voting.html#LazyConsensus page itself isn't clear and we targeted to fix that page.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org
[GitHub] [spark-website] HyukjinKwon commented on a change in pull request #284: Update committer guide
Posted by GitBox <gi...@apache.org>.
HyukjinKwon commented on a change in pull request #284:
URL: https://github.com/apache/spark-website/pull/284#discussion_r469653695
##########
File path: committers.md
##########
@@ -132,6 +132,27 @@ In particular, if you are working on an area of the codebase you are unfamiliar
Git history for that code to see who reviewed patches before. You can do this using
`git log --format=full <filename>`, by examining the "Commit" field to see who committed each patch.
+<h3>When to commit/merge a pull request</h3>
+
+PRs shall not be merged during active, on-topic discussion unless they address issues such as critical security fixes of a public vulnerability. Under extenuating circumstances, PRs may be merged during active, off-topic discussion and the discussion directed to a more appropriate venue. Time should be given prior to merging for those involved with the conversation to explain if they believe they are on-topic.
Review comment:
I think we can just say for example 72 hours. That's [the example in the lazy consensus](https://www.apache.org/foundation/voting.html#LazyConsensus), and I believe we're rather clarifying and reiterate what we wrote there here.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org