Page History

...

1. Decide with team if a bug should be dropped back to previous release or not, consider things like (use fix-version field in Jira to indicate this)
   1. bug was reported by user of previous release (easy decision )
   2. bug exposes behavior that was not in line with acceptance criteria for a user story that was delivered in previous release
2. Make the fix and have it merged in master branch
3. Cherry pick the fix from master branch to release branch
   1. From Gerrit:
      
      1. Navigate to ... / Cherry Pick
      2. Fill the form with the release branch name (honolulu) in "Cherry Pick to branch" field and click "Cherry Pick"
         
         
         
   2. LocallyUsing local branch (to resolve cherry-pick conflicts):
      1. Create local branch from honolulu
      2. Cherry-pick commit from master branch
      3. Resolve conflicts
      4. git push origin HEAD:refs/for/honolulu
4. Update Release version if required, see
   1. Release Versioning Strategy (proposal for Honolulu)
   2. ONAP API Common Versioning Strategy (CVS) Guidelines
5. Review patch by peers as normal 
6. Once the fix is in release branch, deliver releases artifacts from release branch as described in previous section.

...