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-12-SP4 into SLE-15-GA #833

Merged
merged 12 commits into from Jun 12, 2019

Conversation

Projects
None yet
3 participants
@teclator
Copy link
Contributor

commented Jun 11, 2019

It merges #829 & #825 into SLE-15-GA

mchf and others added some commits Jun 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
@coveralls

This comment has been minimized.

Copy link

commented Jun 11, 2019

Coverage Status

Coverage increased (+0.03%) to 35.822% when pulling 3703e1f on merge_SLE-12-SP4 into 9dcbe19 on SLE-15-GA.

bus_id = HTML.Bold("BusID : ") + item_hwinfo["busid"].to_s + "<br>"
physical_port_id = HTML.Bold("PhysicalPortID : ") + physical_port_id(ifcfg_name) + "<br>"

rich << " " << conn << "<br>" << mac_dev if IsNotEmpty(item_hwinfo["mac"])
rich << " " << conn << "<br>" << mac_dev if IsNotEmpty(item_hwinfo["permanent_mac"])

This comment has been minimized.

Copy link
@mchf

mchf Jun 12, 2019

Member

NP: i know it is a merge but may be that we can start droping these IsNotEmptyhelpers

This comment has been minimized.

Copy link
@teclator

teclator Jun 12, 2019

Author Contributor

network-ng will kill it :P

@mchf

mchf approved these changes Jun 12, 2019

Copy link
Member

left a comment

lgtm

@teclator teclator merged commit 157643f into SLE-15-GA Jun 12, 2019

3 of 4 checks passed

Codacy/PR Quality Review Codacy was unable to analyse your 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-12-SP4 branch Jun 12, 2019

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.