Merge citrix branch into master.
authorBen Pfaff <blp@nicira.com>
Wed, 2 Sep 2009 17:14:53 +0000 (10:14 -0700)
committerBen Pfaff <blp@nicira.com>
Wed, 2 Sep 2009 17:14:53 +0000 (10:14 -0700)
commitf1acd62b54376a425a975f9af501c4c8c5689b39
treea579f967870b61d3a226acdc62cc079c8ce996d1
parent2c7807ac4f578bfdd7a46b79028935c9aa34cde3
parent0ad9b732910b8f1aa7fc47ea57ff79e7618a4e6d
Merge citrix branch into master.
12 files changed:
datapath/datapath.c
datapath/datapath.h
extras/ezio/ovs-switchui.c
include/openvswitch/datapath-protocol.h
lib/netdev-linux.c
lib/netdev-provider.h
lib/netdev.c
lib/netdev.h
ofproto/in-band.c
ofproto/in-band.h
ofproto/ofproto.c
vswitchd/bridge.c