8.0 MU 1: fix upstream sync conflicts - Neutron

Bug #1569883 reported by Vitaly Sedelnik
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Mirantis OpenStack
Fix Committed
Sergii Rizvan

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

Tags: non-release
Changed in fuel:
milestone: none → 8.0-updates
status: New → Confirmed
Changed in mos:
milestone: none → 8.0-updates
no longer affects: fuel
Changed in mos:
status: New → Confirmed
importance: Undecided → High
assignee: nobody → Sergii Rizvan (srizvan)
milestone: 8.0-updates → 8.0-mu-1
Sergii Rizvan (srizvan)
Changed in mos:
status: Confirmed → In Progress
Revision history for this message
Sergii Rizvan (srizvan) wrote :
Revision history for this message
Fuel Devops McRobotson (fuel-devops-robot) wrote : Fix merged to openstack/neutron (openstack-ci/fuel-8.0/liberty)
Download full text (4.4 KiB)

Reviewed: https://review.fuel-infra.org/19596
Submitter: Pkgs Jenkins <email address hidden>
Branch: openstack-ci/fuel-8.0/liberty

Commit: 810f286a0765bc9cba214169dfe5cea71c37459a
Author: Sergii Rizvan <email address hidden>
Date: Wed Apr 20 15:21:21 2016

Merge the tip of origin/stable/liberty into origin/openstack-ci/fuel-8.0/liberty

a38cb93 ML2: update port's status to DOWN if its binding info has changed
9d6a82f Updated from global requirements
996af44 Fix corrupted release note in Liberty
fd5fd25 Iptables firewall prevent IP spoofed DHCP requests
275a171 Switched from fixtures to mock to mock out starting RPC consumers
3a922a2 Don't drop 'protocol' from client supplied security_group_rule dict
90fb36f Split the FIP Namespace delete in L3 agent for DVR
b392ad1 Don't delete br-int to br-tun patch on startup
c823e8c add arp_responder flag to linuxbridge agent
695335b Switches metering agent to stateless iptables
0e543db Fix setting peer to bridge interfaces
7175fde Refactor and fix dummy process fixture
6dea586 Remove obsolete keepalived PID files before start
761a1be Support Routes==2.3
05e9044 Move test_extend_port_dict_no_port_security to where it belongs to
c0d53a3 SG protocol validation to allow numbers or names
5ad201c Change log level from error to warning
e09c435 DHCP: Downgrade 'network has been deleted' logs
4848c71 Catch DBDuplicateEntry errors in RBAC code
8de5b03 Change the exception type from ValueError to IpamValueInvalid
4cb9062 lb: avoid doing nova VIF work plumbing tap to qbr
e17f391 Remove test_external_network_visibility
a86274e Check tap bridge timestamps to detect local changes
362896a Catch DB reference errors in binding DVR ports
a42b176 Close XenAPI sessions in neutron-rootwrap-xen-dom0
967d003 Allow address pairs to be cleared with None
1252c3f Downgrade "device not found" log message
2be884a Add option for nova endpoint type
e61a77c Update devstack plugin for dependent packages
d774e70 Removes host file contents from DHCP agent logs
e4f590d De-dup conntrack deletions before running them
feaf9d3 Optimize and refactor router delete execution
fe0a1ca Unmarshall portinfo on update_fdb_entries calls
d37288b Avoid DuplicateOptError in functional tests
e1de91d Correct insufficient name for external process in manager log
2601fe0 Retry port create/update on duplicate db records
82cb3c2 Catch PortNotFound after HA router race condition
ccdfd17 Prevent binding IPv6 addresses to Neutron interfaces
4ad1834 Documenting network_device_mtu in agents config files
249470f Make all tox targets constrained
3a22335 Do not remove router from dvr_snat agents on dvr port deletion
e2ca10e Filter HA routers without HA interface and state
1382da4 Correct return values for bridge sysctl calls
1f92511 Add tests for RPC methods/classes
2b4838e Fix sanity check --no* BoolOpts
67ab873 Add extension requirement in port-security api test
9e11c5b Fix for adding gateway with IP outside subnet
f860bdd Add the rebinding chance in _bind_port_if_needed
e573352 DHCP: release DHCP port if not enough memory
a381aa0 Disable IPv6 on bridge devices in LinuxBridgeManager
e93c5dc ML2: delete_port on deadlock during binding
9cb6591 Postpone heavy polic...


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.