[Merge] ~mylesjp/ubuntu/+source/networking-baremetal:master into ~ubuntu-openstack-dev/ubuntu/+source/networking-baremetal:master

[Nick Rosbrook]

Review: Needs Fixing

Diff looks okay, but building the source package is failing for me with:

dpkg-source: info: local changes detected, the modified files are:
 networking-baremetal/.eggs/README.txt
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/EGG-INFO/AUTHORS
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/EGG-INFO/LICENSE
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/EGG-INFO/PKG-INFO
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/EGG-INFO/RECORD
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/EGG-INFO/WHEEL
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/EGG-INFO/entry_points.txt
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/EGG-INFO/requires.txt
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/EGG-INFO/top_level.txt
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/_compat/command_hooks.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/_compat/commands.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/_compat/five.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/_compat/metadata.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/_compat/packaging.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/build.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/cmd/main.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/core.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/extra_files.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/find_package.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/git.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/hooks/__init__.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/hooks/backwards.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/hooks/base.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/hooks/files.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/hooks/metadata.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/options.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/packaging.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/pbr_json.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/sphinxext.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/__init__.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/_compat/test_commands.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/base.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/fixtures.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/functional/base.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/functional/test_c_extension.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/functional/test_changelog_author.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/functional/test_commands.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/functional/test_console_scripts.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/functional/test_extra_files.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/functional/test_hooks.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/functional/test_integration.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/functional/test_pbr_json.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/functional/test_pep517.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/functional/test_requirements.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/functional/test_wsgi_scripts.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/test_files.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/test_git.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/test_packaging.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/test_pbr_json.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/test_util.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/test_version.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/testpackage/CHANGES.txt
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/testpackage/LICENSE.txt
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/testpackage/MANIFEST.in
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/testpackage/README.txt
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/testpackage/doc/source/conf.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/testpackage/doc/source/index.rst
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/testpackage/doc/source/installation.rst
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/testpackage/doc/source/usage.rst
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/testpackage/pbr_testpackage/__init__.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/testpackage/pbr_testpackage/_setup_hooks.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/testpackage/pbr_testpackage/cmd.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/testpackage/pbr_testpackage/wsgi.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/testpackage/setup.cfg
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/testpackage/setup.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/testpackage/src/testext.c
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/testpackage/test-requirements.txt
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/tests/util.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/util.py
 networking-baremetal/.eggs/pbr-7.0.1-py3.12.egg/pbr/version.py
dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/networking-baremetal_7.0.0-0ubuntu1.diff.5g7bBM
dpkg-source: info: Hint: make sure the version in debian/changelog matches the unpacked source tree
dpkg-source: info: you can integrate the local changes with dpkg-source --commit
dpkg-buildpackage: error: dpkg-source -b . subprocess returned exit status 2
debuild: fatal error at line 1184:
dpkg-buildpackage -us -uc -ui -S -d -sa failed

-- 
https://code.launchpad.net/~mylesjp/ubuntu/+source/networking-baremetal/+git/networking-baremetal/+merge/493159
Your team Ubuntu OpenStack uploaders is subscribed to branch ~ubuntu-openstack-dev/ubuntu/+source/networking-baremetal:master.