8.0 MU 1: fix upstream sync conflicts - Heat

Bug #1570724 reported by Denis Meltsaykin
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Mirantis OpenStack
Fix Committed
Rodion Tikunov

Bug Description

Steps to reproduce:

1. git clone https://github.com/Mirantis/tools-sustaining.git
2. cd tools-sustaining/jenkins/codesync/
3. Check neutron.yaml, make sure it has your full name, account name and email in gerrit-base-uri, committer-name, committer-email fields. Change project to Heat.
4. python codesync.py neutron.yaml --action merge_tip --downstream-branch openstack-ci/fuel-8.0/liberty --upstream-branch stable/liberty --topic sync/stable/liberty --dry-run
5. cd heat
6. git status
7. Fix merge conflicts
8. git commit (use commit message text generated in step 4)
9. git review
10. Work with heat team to get this review merged

Tags: non-release
Changed in mos:
assignee: MOS Maintenance (mos-maintenance) → Rodion Tikunov (rtikunov)
status: New → Confirmed
importance: Undecided → High
Changed in mos:
milestone: 8.0-updates → 8.0-mu-1
Changed in mos:
status: Confirmed → In Progress
Changed in mos:
status: In Progress → Fix Committed
tags: added: non-release
Changed in mos:
milestone: 8.0-mu-1 → 8.0-updates
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.