Merge "Add devices to update in RPC call security_groups_provider_updated"

diff --cc neutron/agent/securitygroups_rpc.py
Simple merge

diff --cc neutron/api/rpc/handlers/securitygroups_rpc.py
Simple merge

diff --cc neutron/db/securitygroups_rpc_base.py
Simple merge

diff --cc neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py
Simple merge

diff --cc neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
index d93560b07ac87dc4e935d2d75499ebd3ccc26a41,8185d4d88de4c24ed405e5e7914b29ba43b2996f..befa561bf49d66b2e92a3c9ff340c5933b151073
--- 1/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
--- 2/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
+++ b/neutron/plugins/openvswitch/agent/ovs_neutron_agent.py
@@@ -122,9 -117,10 +122,10 @@@ class OVSNeutronAgent(sg_rpc.SecurityGr
      #   1.0 Initial version
      #   1.1 Support Security Group RPC
      #   1.2 Support DVR (Distributed Virtual Router) RPC
-     target = oslo_messaging.Target(version='1.2')
+     #   1.3 Added param devices_to_update to security_groups_provider_updated
+     target = oslo_messaging.Target(version='1.3')
  
 -    def __init__(self, integ_br, tun_br, local_ip,
 +    def __init__(self, bridge_classes, integ_br, tun_br, local_ip,
                   bridge_mappings, polling_interval, tunnel_types=None,
                   veth_mtu=None, l2_population=False,
                   enable_distributed_routing=False,

diff --cc neutron/tests/unit/agent/test_securitygroups_rpc.py
Simple merge

diff --cc neutron/tests/unit/api/rpc/handlers/test_securitygroups_rpc.py
Simple merge

diff --cc neutron/tests/unit/plugins/ml2/test_plugin.py
Simple merge