]> git.proxmox.com Git - mirror_ifupdown2.git/commitdiff
projects / mirror_ifupdown2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 07325f6 87f30e5)
Merge branch 'master-next' into python3
authorJulien Fortin <julien@cumulusnetworks.com>
Tue, 4 Feb 2020 14:47:00 +0000 (15:47 +0100)
committerJulien Fortin <julien@cumulusnetworks.com>
Tue, 4 Feb 2020 14:47:00 +0000 (15:47 +0100)
* master-next:
  This also adds ipip6 to nlpacket IFLA_INFO_KIND.

1  2 
ifupdown2/nlmanager/nlpacket.py patch | diff1 | diff2 | blob | history

diff --cc ifupdown2/nlmanager/nlpacket.py
Simple merge
Upstream mirror of ifupdown2