8.0 MU 1: fix upstream sync conflicts - Murano
Bug #1570728 reported by
Denis Meltsaykin
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Mirantis OpenStack |
Fix Committed
|
High
|
Alexey Stupnikov | ||
Bug Description
Steps to reproduce:
1. git clone https:/
2. cd tools-sustainin
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 the project to Murano.
4. python codesync.py neutron.yaml --action merge_tip --downstream-branch openstack-
5. cd murano
6. git status
7. Fix merge conflicts
8. git commit (use commit message text generated in step 4)
9. git review
10. Work with murano team to get this review merged
| Changed in mos: | |
| assignee: | MOS Maintenance (mos-maintenance) → Alexey Stupnikov (astupnikov) |
Revision history for this message
| Alexey Stupnikov (astupnikov) wrote | #1 |
| Changed in mos: | |
| importance: | Undecided → High |
| status: | New → In Progress |
| Changed in mos: | |
| milestone: | 8.0-updates → 8.0-mu-1 |
| Changed in mos: | |
| status: | In Progress → Fix Committed |
| Changed in mos: | |
| milestone: | 8.0-mu-1 → 8.0-updates |
| tags: | added: non-release |
To post a comment you must log in.
Gerrit review: https:/