[Hadoop Wiki] Update of "HowToCommit" by AndrewWang

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Hadoop Wiki" for change 
notification.

The "HowToCommit" page has been changed by AndrewWang:
https://wiki.apache.org/hadoop/HowToCommit?action=diff=37=38

Comment:
update fix version instructions

  1. Cherry-pick the changes to other appropriate branches via {{{git 
cherry-pick -x }}}. The -x option records the source commit, and 
reuses the original commit message. Resolve any conflicts.
  1. If the conflicts are major, it is preferable to produce a new patch 
for that branch, review it separately and commit it. When committing an edited 
patch to other branches, please follow the same steps and make sure to include 
the JIRA number and description of changes in the commit message.
  1. When backporting to branch-2.7 or older branches, we need to update 
CHANGES.txt.
-  1. Resolve the issue as fixed, thanking the contributor.  Always set the 
"Fix Version" at this point, but please only set a single fix version, the 
earliest release in which the change will appear. '''Special case'''- when 
committing to a ''non-mainline'' branch (such as branch-0.22 or branch-0.23 
ATM), please set fix-version to either 2.x.x or 3.x.x appropriately too.
+  1. Resolve the issue as fixed, thanking the contributor.  Follow the rules 
specified at [[https://hadoop.apache.org/versioning.html|Apache Hadoop Release 
Versioning]] for how to set fix versions appropriately, it's important for 
tracking purposes with concurrent release lines.
   1. Set the assignee if it is not set. If you cannot set the contributor to 
the assignee, you need to add the contributor into Contributors role in the 
project. Please see [[#Roles|Adding Contributors role]] for the detail.
  
  This How-to-commit 
[[http://www.youtube.com/watch?v=txW3m7qWdzw=youtu.be|video]] has 
guidance on the commit process, albeit using svn. Most of the process is still 
the same, except that we now use git instead. 

-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[Hadoop Wiki] Update of "HowToCommit" by AndrewWang

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Hadoop Wiki" for change 
notification.

The "HowToCommit" page has been changed by AndrewWang:
https://wiki.apache.org/hadoop/HowToCommit?action=diff=33=34

Comment:
remove CHANGES.txt step, now autogenerated

  
   Committing a patch 
  When you commit a patch, please follow these steps:
-  1. '''CHANGES.txt:''' Add an entry in CHANGES.txt, at the end of the 
appropriate section. This should include the JIRA issue ID, and the name of the 
contributor. Attribution in CHANGES.txt should fall under the earliest release 
that is receiving the patch, and it should be consistent across all live 
branches. If the patch is targeted to 2.8.0, then its CHANGES.txt entry would 
go in the 2.8.0 section on trunk and branch-2. If the patch is targeted to 
2.7.2, then its CHANGES.txt entry would go in the 2.7.2 section on trunk, 
branch-2 and branch-2.7.  When backporting a patch that was previously 
committed for a later branch, please update its CHANGES.txt entry on all 
branches for accuracy. Suppose a patch initially targets 2.8.0, but then later 
becomes a candidate for 2.7.2. On the initial commit, it would have been listed 
under the 2.8.0 section on trunk and branch-2. After the decision to backport 
to 2.7.2, go back and update CHANGES.txt on all branches to match reality, 
moving it to the 2.7.2 section on trunk, branch-2 and branch-2.7.
   1. '''Commit locally:''' Commit the change locally to the appropriate branch 
(should be ''trunk'' if it is not a feature branch) using {{{git commit -a -m 
}}}. The commit message should include the JIRA issue id, along 
with a short description of the change and the name of the contributor if it is 
not you. ''Note:'' Be sure to get the issue id right, as this causes JIRA to 
link to the change in git (use the issue's "All" tab to see these). Verify all 
the changes are included in the commit using {{{git status}}}. If there are any 
remaining changes (previously missed files), please commit them and squash 
these commits into one using {{{git rebase -i}}}.
   1. '''Pull latest changes from remote repo:''' Pull in the latest changes 
from the remote branch using {{{git pull --rebase}}} (--rebase is not required 
if you have setup git pull to always --rebase). Verify this didn't cause any 
merge commits using {{{git log [--pretty=oneline]}}}
   1. '''Push changes to remote repo:''' Build and run a test to ensure it is 
all still kosher. Push the changes to the remote (main) repo using {{{git push 
 }}}.