From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Fri, 24 Jul 2015 12:24:10 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/feature/qos' into merge-branch
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=fcc5d5bcf7348f3c6e530463ef4e90acddd04286;p=openstack-build%2Fneutron-build.git

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

Change-Id: I1c1fd593235fda1cdd053980f50eff21ca9011b6
---

fcc5d5bcf7348f3c6e530463ef4e90acddd04286
diff --cc neutron/db/migration/alembic_migrations/versions/HEADS
index be4adef8d,8a0a139d7..aae43e394
--- a/neutron/db/migration/alembic_migrations/versions/HEADS
+++ b/neutron/db/migration/alembic_migrations/versions/HEADS
@@@ -1,3 -1,3 +1,3 @@@
 +2a16083502f3
- 8675309a5c4f
+ 48153cb5f051
 -4ffceebfada
  kilo
diff --cc neutron/tests/api/base.py
index 2790240eb,92979252a..f23e52826
--- a/neutron/tests/api/base.py
+++ b/neutron/tests/api/base.py
@@@ -88,9 -88,9 +88,11 @@@ class BaseNetworkTest(neutron.tests.tem
          cls.fw_rules = []
          cls.fw_policies = []
          cls.ipsecpolicies = []
+         cls.qos_rules = []
+         cls.qos_policies = []
          cls.ethertype = "IPv" + str(cls._ip_version)
 +        cls.address_scopes = []
 +        cls.admin_address_scopes = []
  
      @classmethod
      def resource_cleanup(cls):