]> git.proxmox.com Git - mirror_ifupdown2.git/commitdiff
projects / mirror_ifupdown2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc7efff 67c84da)
Merge branch 'master-next' into python3
authorJulien Fortin <julien@cumulusnetworks.com>
Tue, 21 Jan 2020 08:33:20 +0000 (09:33 +0100)
committerJulien Fortin <julien@cumulusnetworks.com>
Tue, 21 Jan 2020 08:33:20 +0000 (09:33 +0100)
* master-next:
  addons: address: convert ip addresses from statemanager to IPNetwork objects
  main: add extra log info to output the exit status

1  2 
ifupdown2/__main__.py patch | diff1 | diff2 | blob | history
ifupdown2/addons/address.py patch | diff1 | diff2 | blob | history

diff --cc ifupdown2/__main__.py
Simple merge
diff --cc ifupdown2/addons/address.py
Simple merge
Upstream mirror of ifupdown2