]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commit
Merge remote-tracking branch 'origin/feature/qos' into merge-branch
authorIhar Hrachyshka <ihrachys@redhat.com>
Wed, 5 Aug 2015 15:15:40 +0000 (17:15 +0200)
committerIhar Hrachyshka <ihrachys@redhat.com>
Wed, 5 Aug 2015 15:15:40 +0000 (17:15 +0200)
commitcc0ae6dd49da3e67c1d0400bc422e735c27e98fb
tree786bc4319d871c6fbf6cb158b94528c48a8e5fcd
parentdf35d21141dc4544421ccbff8715ea6da3e03def
parentb0275b6f14d662f3e94f553d61111a45ff009a6c
Merge remote-tracking branch 'origin/feature/qos' into merge-branch

Change-Id: I683102e617202e0ffc953a0d3cc179879f8faf82
20 files changed:
doc/source/devref/index.rst
etc/neutron.conf
neutron/agent/common/ovs_lib.py
neutron/cmd/sanity/checks.py
neutron/common/constants.py
neutron/common/exceptions.py
neutron/db/db_base_plugin_common.py
neutron/db/migration/alembic_migrations/versions/liberty/expand/48153cb5f051_qos_db_changes.py
neutron/db/migration/models/head.py
neutron/plugins/ml2/drivers/mech_sriov/agent/pci_lib.py
neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
neutron/plugins/ml2/plugin.py
neutron/plugins/ml2/rpc.py
neutron/tests/api/base.py
neutron/tests/functional/agent/test_ovs_lib.py
neutron/tests/unit/plugins/ml2/drivers/mech_sriov/agent/test_pci_lib.py
neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
neutron/tests/unit/plugins/ml2/test_rpc.py
requirements.txt
setup.cfg