8.0 MU 1: fix upstream sync conflicts - Glance

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

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 glance.
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 glance
6. git status
7. Fix merge conflicts
8. git commit (use commit message text generated in step 4)
9. git review
10. Work with glance team to get this review merged

Tags: non-release
Denis Puchkin (dpuchkin)
Changed in mos:
assignee: MOS Maintenance (mos-maintenance) → Denis Puchkin (dpuchkin)
Changed in mos:
importance: Undecided → High
status: New → Confirmed
milestone: 8.0-updates → 8.0-mu-1
Revision history for this message
Vitaly Sedelnik (vsedelnik) wrote :
Changed in mos:
status: Confirmed → 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.