This reverts commit ed586a0355fb99a5b1fbeadfc0625f0ceffe8b72.
The quota_class subcommand in python-novaclient was used to set default
quota values so it shouldn't have been removed. As now it is being
restored, the defaults quota panel is being restored too.
Resolved merge conflicts by hand in:
openstack_dashboard/api/cinder.py
openstack_dashboard/dashboards/admin/info/tabs.py
openstack_dashboard/dashboards/admin/info/tests.py
Updated translatable segments to match refactors in
openstack_dashboard/dashboards/admin/defaults/workflows.py
openstack_dashboard/dashboards/admin/defaults/tables.py
Fixed most egregious post-merge styling errors in
openstack_dashboard/dashboards/admin/defaults/templates/defaults/index.html
(probably should have been separate, but I just couldn't let it out that way!)
Removed unrelated file that was allowed to be part of the original commit
doc/source/topics/settings.rst
Co-Authored-By: Doug Fish <email address hidden>
Change-Id: Ic4c4ecec843c7ea9afd0db36ce0eb15952da15b3
Partial-Bug: #1299517
Reviewed: https:/ /review. openstack. org/96766 /git.openstack. org/cgit/ openstack/ horizon/ commit/ ?id=b2dd9ded59e 84ac22381ca2e57 6c08fc67aafece
Committed: https:/
Submitter: Jenkins
Branch: master
commit b2dd9ded59e84ac 22381ca2e576c08 fc67aafece
Author: Sergio Cazzolato <email address hidden>
Date: Thu May 29 17:10:10 2014 -0300
Revert "Remove the update default quotas feature"
This reverts commit ed586a0355fb99a 5b1fbeadfc0625f 0ceffe8b72.
The quota_class subcommand in python-novaclient was used to set default
quota values so it shouldn't have been removed. As now it is being
restored, the defaults quota panel is being restored too.
Related mailing list thread on the topic: lists.openstack .org/pipermail/ openstack- dev/2014- May/035383. html
http://
Resolved merge conflicts by hand in: dashboard/ api/cinder. py dashboard/ dashboards/ admin/info/ tabs.py dashboard/ dashboards/ admin/info/ tests.py
openstack_
openstack_
openstack_
Updated translatable segments to match refactors in dashboard/ dashboards/ admin/defaults/ workflows. py dashboard/ dashboards/ admin/defaults/ tables. py
openstack_
openstack_
Fixed most egregious post-merge styling errors in dashboard/ dashboards/ admin/defaults/ templates/ defaults/ index.html
openstack_
(probably should have been separate, but I just couldn't let it out that way!)
Removed unrelated file that was allowed to be part of the original commit source/ topics/ settings. rst
doc/
Co-Authored-By: Doug Fish <email address hidden> a9afd0db36ce0eb 15952da15b3
Change-Id: Ic4c4ecec843c7e
Partial-Bug: #1299517