Merge "Merge remote-tracking branch 'origin/feature/qos' into merge-branch" into...

diff --cc neutron/db/db_base_plugin_common.py
index 9a2b09c5b9be8b98c23652b16af1a8a9b55ebb3b,29816ca39ac026cad85faec107ab554d16e70c09..38d3d3b7f999cfc4f8d43c08cd974fd1b413bd65
--- 1/neutron/db/db_base_plugin_common.py
--- 2/neutron/db/db_base_plugin_common.py
+++ b/neutron/db/db_base_plugin_common.py
@@@ -244,11 -225,9 +244,11 @@@ class DbBasePluginCommon(common_db_mixi
          if process_extensions:
              self._apply_dict_extend_functions(
                  attributes.NETWORKS, res, network)
 +            self._extend_resource(resources.NETWORK, events.AFTER_READ, res)
 +
          return self._fields(res, fields)
  
-     def _make_subnet_args(self, context, shared, detail,
+     def _make_subnet_args(self, shared, detail,
                            subnet, subnetpool_id=None):
          args = {'tenant_id': detail.tenant_id,
                  'id': detail.subnet_id,

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