From: John Berezovik <johnberezovik@cumulusnetworks.com>
Date: Wed, 18 Jun 2014 18:23:55 +0000 (-0700)
Subject: Merge branch 'CumulusLinux-2.1.0_release_br' into CumulusLinux-2.1_br
X-Git-Tag: 1.2.2-1~146^2~454^2~12
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=df883c45e257ed384b1d3888609c77406198cac6;p=mirror_ifupdown2.git

Merge branch 'CumulusLinux-2.1.0_release_br' into CumulusLinux-2.1_br

Conflicts:
	packages/cafe/commands/vxlan_lib.py
	packages/cl-utilities/bin/cl-ns-mgmt
	switchd/sync.c
---

df883c45e257ed384b1d3888609c77406198cac6