diff options
| author | Justin Pettit <jpettit@nicira.com> | 2010-02-05 15:58:27 -0800 |
|---|---|---|
| committer | Justin Pettit <jpettit@nicira.com> | 2010-02-05 17:14:55 -0800 |
| commit | a4af00400a835eb87569ba40e21874c05e872c0f (patch) | |
| tree | d9c6db715493bd6fc17c91e9552f8037c3ea7caa /vswitchd/vswitch-idl.ann | |
| parent | 93ff0290fda0f02904686989243089faaa9229e6 (diff) | |
| parent | 5819a7cdcf44f0277c538353672fb27701c764f9 (diff) | |
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
Diffstat (limited to 'vswitchd/vswitch-idl.ann')
| -rw-r--r-- | vswitchd/vswitch-idl.ann | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/vswitchd/vswitch-idl.ann b/vswitchd/vswitch-idl.ann index ff5766ae..b8e457d5 100644 --- a/vswitchd/vswitch-idl.ann +++ b/vswitchd/vswitch-idl.ann @@ -13,6 +13,7 @@ s["tables"]["Open_vSwitch"]["columns"]["ssl"]["type"]["keyRefTable"] = "SSL" s["tables"]["Bridge"]["columns"]["ports"]["type"]["keyRefTable"] = "Port" s["tables"]["Bridge"]["columns"]["mirrors"]["type"]["keyRefTable"] = "Mirror" s["tables"]["Bridge"]["columns"]["netflow"]["type"]["keyRefTable"] = "NetFlow" +s["tables"]["Bridge"]["columns"]["sflow"]["type"]["keyRefTable"] = "sFlow" s["tables"]["Bridge"]["columns"]["controller"]["type"]["keyRefTable"] = "Controller" s["tables"]["Port"]["columns"]["interfaces"]["type"]["keyRefTable"] = "Interface" s["tables"]["Mirror"]["columns"]["select_src_port"]["type"]["keyRefTable"] = "Port" |