Merge branch 'master' into next

[openvswitch] / vswitchd / vswitch-idl.ann

diff --git a/vswitchd/vswitch-idl.ann b/vswitchd/vswitch-idl.ann
index ff5766aecb5b48fb84b5ed3307208720dfec374f..b8e457d5b469e36df035dd59ff91d81b7a3960fe 100644 (file)
--- 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"