]> git.proxmox.com Git - mirror_ifupdown2.git/commitdiff
projects / mirror_ifupdown2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16f606e 394d1ea)
Merge branch 'CumulusLinux-2.1.0_release_br' into CumulusLinux-2.1_br
authorJohn Berezovik <johnberezovik@cumulusnetworks.com>
Wed, 18 Jun 2014 18:23:55 +0000 (11:23 -0700)
committerJohn Berezovik <johnberezovik@cumulusnetworks.com>
Wed, 18 Jun 2014 18:23:55 +0000 (11:23 -0700)
Conflicts:
packages/cafe/commands/vxlan_lib.py
packages/cl-utilities/bin/cl-ns-mgmt
switchd/sync.c


Trivial merge
Upstream mirror of ifupdown2