]> git.proxmox.com Git - mirror_ifupdown2.git/commit - ifupdown2/ifupdownaddons/modulebase.py
projects / mirror_ifupdown2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 46c2e97 c1b6ffc)
Merge branch 'master' into master-next
authorJulien Fortin <julien@cumulusnetworks.com>
Wed, 4 Mar 2020 15:16:30 +0000 (16:16 +0100)
committerJulien Fortin <julien@cumulusnetworks.com>
Wed, 4 Mar 2020 15:16:30 +0000 (16:16 +0100)
commit5ca7021683f020f90108908c7474eef28b6ccbb1
tree3ca744d131cc52ae6ae94f5fae9ad0e6ff521f5atree
parent46c2e97909a71b5a46bc926fd3b1d8010dce9705commit | diff
parentc1b6ffc78c4e8e2f02a587de1ad0c8c951163edecommit | diff
Merge branch 'master' into master-next

* master:
  addons: ethtool: add support for "ethtool_ignore_errors" policy
  LinkUtils: mac_str_to_int: fix string to int conversion
  addons: dhcp: if mgmt vrf context exec dhclient in default vrf
ifupdown2/addons/dhcp.py diff1 | diff2 | blob | history
ifupdown2/addons/ethtool.py diff1 | diff2 | blob | history
Upstream mirror of ifupdown2