Merge branch 'master' into next
authorJustin Pettit <jpettit@nicira.com>
Fri, 5 Feb 2010 23:58:27 +0000 (15:58 -0800)
committerJustin Pettit <jpettit@nicira.com>
Sat, 6 Feb 2010 01:14:55 +0000 (17:14 -0800)
commita4af00400a835eb87569ba40e21874c05e872c0f
treed9c6db715493bd6fc17c91e9552f8037c3ea7caa
parent93ff0290fda0f02904686989243089faaa9229e6
parent5819a7cdcf44f0277c538353672fb27701c764f9
Merge branch 'master' into next

Conflicts:
COPYING
datapath/datapath.h
lib/automake.mk
lib/dpif-provider.h
lib/dpif.c
lib/hmap.h
lib/netdev-provider.h
lib/netdev.c
lib/stream-ssl.h
ofproto/executer.c
ofproto/ofproto.c
ofproto/ofproto.h
tests/automake.mk
utilities/ovs-ofctl.c
utilities/ovs-vsctl.in
vswitchd/ovs-vswitchd.conf.5.in
xenserver/etc_init.d_vswitch
xenserver/etc_xensource_scripts_vif
xenserver/opt_xensource_libexec_interface-reconfigure
38 files changed:
COPYING
acinclude.m4
configure.ac
datapath/actions.c
datapath/datapath.c
datapath/datapath.h
lib/automake.mk
lib/dpif-linux.c
lib/dpif-netdev.c
lib/dpif-provider.h
lib/dpif.c
lib/dpif.h
lib/hmap.h
lib/netdev-provider.h
lib/netdev.c
lib/netdev.h
lib/stream-ssl.h
lib/vlog-modules.def
ofproto/automake.mk
ofproto/ofproto-sflow.c
ofproto/ofproto.c
ofproto/ofproto.h
tests/automake.mk
tests/library.at
utilities/automake.mk
utilities/ovs-discover.c
utilities/ovs-dpctl.c
utilities/ovs-ofctl.c
vswitchd/automake.mk
vswitchd/bridge.c
vswitchd/ovs-vswitchd.8.in
vswitchd/vswitch-idl.ann
vswitchd/vswitch.ovsschema
xenserver/etc_init.d_vswitch
xenserver/etc_init.d_vswitch-xapi-update
xenserver/etc_xensource_scripts_vif
xenserver/opt_xensource_libexec_InterfaceReconfigureVswitch.py
xenserver/vswitch-xen.spec