Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge SLE-15-SP1 into master #835

Merged
merged 24 commits into from Jun 14, 2019

Conversation

Projects
None yet
5 participants
@teclator
Copy link
Contributor

commented Jun 13, 2019

It merges #832 & #829 & #825

mchf and others added some commits May 3, 2019

Merge pull request #820 from mchf/SLE-12-SP4
Merged sle-12-sp3 into Sle-12-sp4
Merge pull request #825 from yast/duplicate_udev_key
Do not create duplicate udev attributes
Merge pull request #831 from yast/duplicate_udev_key
Update current udev rule if not exist or the key in use is not the :bus_id
Merge pull request #829 from yast/permanent_mac
Use the permanent hardware address for naming interfaces
Merge pull request #832 from yast/move_routes
Move routes from slave to the new bridge
Merge pull request #833 from yast/merge_SLE-12-SP4
Merge SLE-12-SP4 into SLE-15-GA
Merge pull request #834 from yast/merge_SLE-15-GA
Merge SLE-15-GA into SLE-15-SP1

@teclator teclator changed the title Merge SLE-15-SP1 into master [WIP] Merge SLE-15-SP1 into master Jun 13, 2019

@teclator teclator force-pushed the merge_SLE-15-SP1 branch from 93126a4 to f08191b Jun 13, 2019

@teclator teclator changed the title [WIP] Merge SLE-15-SP1 into master Merge SLE-15-SP1 into master Jun 13, 2019

@teclator teclator force-pushed the merge_SLE-15-SP1 branch from f08191b to 80b785f Jun 13, 2019

@coveralls

This comment has been minimized.

Copy link

commented Jun 13, 2019

Coverage Status

Coverage increased (+0.6%) to 51.065% when pulling 84e39f7 on merge_SLE-15-SP1 into a5ef1da on master.

@@ -909,7 +909,6 @@ def ProposeVirtualized
bridge_name = LanItems.new_type_device("br")
next unless connected_and_bridgeable?(bridge_name, current, config)
LanItems.current = current
LanItems.add_current_device_to_routing

This comment has been minimized.

Copy link
@teclator

teclator Jun 14, 2019

Author Contributor

Using the current name does not help here, so adapted to permit passing the name explicitly.

@teclator teclator force-pushed the merge_SLE-15-SP1 branch from f0e803d to 84e39f7 Jun 14, 2019

@teclator teclator merged commit 8437a38 into master Jun 14, 2019

4 checks passed

Codacy/PR Quality Review Up to standards. A positive pull request.
Details
Docker Build Task Summary
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@teclator teclator deleted the merge_SLE-15-SP1 branch Jun 14, 2019

@yast-bot

This comment has been minimized.

Copy link

commented Jun 14, 2019

✔️ Public Jenkins job #68 successfully finished
✔️ Created OBS submit request #709921

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.