From: Jenkins <jenkins@review.openstack.org>
Date: Tue, 7 Jul 2015 21:57:29 +0000 (+0000)
Subject: Merge "Merge remote-tracking branch 'origin/feature/qos' into merge-branch" into... 
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=58e7e90a6255de920c2759c1142b25baa8464a92;p=openstack-build%2Fneutron-build.git

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

58e7e90a6255de920c2759c1142b25baa8464a92
diff --cc neutron/db/db_base_plugin_common.py
index 9a2b09c5b,29816ca39..38d3d3b7f
--- a/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,