]> git.proxmox.com Git - mirror_ifupdown2.git/commit
Merge branch 'master-next' into python3
authorJulien Fortin <julien@cumulusnetworks.com>
Tue, 28 Jan 2020 11:00:03 +0000 (12:00 +0100)
committerJulien Fortin <julien@cumulusnetworks.com>
Tue, 28 Jan 2020 11:00:03 +0000 (12:00 +0100)
commit0c6b76af51d348b08176aa2203f501dd19f71801
tree1b52da479a229a2a80b6354564fed827612625b1
parent2771a88e13a89fa29717b8f0822b3ead7ca32074
parent040192991d52fb01cfabdf8bf8ba3d5e82fd7953
Merge branch 'master-next' into python3

* master-next:
  nlpacket: add tunnel link_kind to encode support list
  addons.conf: remove duplicate entry for tunnel pre-up
ifupdown2/nlmanager/nlpacket.py