]> git.proxmox.com Git - mirror_ifupdown2.git/commit
Merge remote-tracking branch 'cumulus/dev'
authorRoopa Prabhu <roopa@cumulusnetworks.com>
Mon, 6 Jun 2016 20:18:29 +0000 (13:18 -0700)
committerRoopa Prabhu <roopa@cumulusnetworks.com>
Mon, 6 Jun 2016 20:18:39 +0000 (13:18 -0700)
commitd6dd6fe653a05dc4fb564e2f06f4fb19de46296c
tree0d12f69e05e56eaad47db160e1fbb844eb302e8c
parent1edfb8a39b028349de720f13ab664cabaa0ab0b7
parentc9b929f97e3231f30fcf32879a2c30f55bffa07d
Merge remote-tracking branch 'cumulus/dev'
14 files changed:
debian/copyright
docs/examples/generate_interfaces.py
docs/examples/interfaces
docs/examples/interfaces_bridge_igmp_mstp
docs/examples/vlan_aware_bridges/interfaces.with_bonds
docs/examples/vlan_aware_bridges/interfaces.with_clag
docs/source/addonsapiref.rst
docs/source/addonshelperapiref.rst
docs/source/userguide.rst
man.rst/ifquery.8.rst
man.rst/ifreload.8.rst
man.rst/ifup.8.rst
man.rst/ifupdown-addons-interfaces.5.rst
man.rst/interfaces.5.rst