From ed6c98215e94644f12f4a59dcf30b74eb2418b51 Mon Sep 17 00:00:00 2001 From: Max Rasskazov Date: Fri, 21 Mar 2014 14:50:01 +0400 Subject: [PATCH] Patch mos-disable-metering.patch moved to code MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Patch has been added to specs by: > commit 6050f4bc789d630c94a27eb6f4611b0e238cb4d0 > Author: Roman Vyalov > Date: Mon Dec 16 13:18:18 2013 +0400 > > Add patch mos-disable-metering.patch; OSCI-973 Patch info: Change-request info: > Your change was committed before the commit hook was installed. > Amending the commit to add a gerrit change id. > remote: > remote: New Changes: > remote: http://gerrit.mirantis.com/13652 > remote: > To ssh://mrasskazov@gerrit.mirantis.com:29418/openstack/horizon.git > * [new branch] HEAD -> refs/publish/openstack-ci/fuel-5.0/2014.1/mos-disable-metering.patch --- debian/patches/mos-disable-metering.patch | 13 ------------- debian/patches/series | 1 - rpm/SOURCES/mos-disable-metering.patch | 13 ------------- rpm/SPECS/python-django-horizon.spec | 2 -- 4 files changed, 29 deletions(-) delete mode 100644 debian/patches/mos-disable-metering.patch delete mode 100644 rpm/SOURCES/mos-disable-metering.patch diff --git a/debian/patches/mos-disable-metering.patch b/debian/patches/mos-disable-metering.patch deleted file mode 100644 index 84b68e9..0000000 --- a/debian/patches/mos-disable-metering.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/openstack_dashboard/dashboards/admin/dashboard.py b/openstack_dashboard/dashboards/admin/dashboard.py -index bdfc6ef..cf01ca1 100644 ---- a/openstack_dashboard/dashboards/admin/dashboard.py -+++ b/openstack_dashboard/dashboards/admin/dashboard.py -@@ -22,7 +22,7 @@ import horizon - class SystemPanels(horizon.PanelGroup): - slug = "admin" - name = _("System Panel") -- panels = ('overview', 'metering', 'hypervisors', 'instances', 'volumes', -+ panels = ('overview', 'hypervisors', 'instances', 'volumes', - 'flavors', 'images', 'networks', 'routers', 'defaults', 'info') - - diff --git a/debian/patches/series b/debian/patches/series index 813ce13..c54390c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,5 +7,4 @@ fix-dashboard-manage.patch fix-ubuntu-tests.patch ubuntu_settings.patch -mos-disable-metering.patch mos-fix-murano-savana-dashboard.patch diff --git a/rpm/SOURCES/mos-disable-metering.patch b/rpm/SOURCES/mos-disable-metering.patch deleted file mode 100644 index 84b68e9..0000000 --- a/rpm/SOURCES/mos-disable-metering.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/openstack_dashboard/dashboards/admin/dashboard.py b/openstack_dashboard/dashboards/admin/dashboard.py -index bdfc6ef..cf01ca1 100644 ---- a/openstack_dashboard/dashboards/admin/dashboard.py -+++ b/openstack_dashboard/dashboards/admin/dashboard.py -@@ -22,7 +22,7 @@ import horizon - class SystemPanels(horizon.PanelGroup): - slug = "admin" - name = _("System Panel") -- panels = ('overview', 'metering', 'hypervisors', 'instances', 'volumes', -+ panels = ('overview', 'hypervisors', 'instances', 'volumes', - 'flavors', 'images', 'networks', 'routers', 'defaults', 'info') - - diff --git a/rpm/SPECS/python-django-horizon.spec b/rpm/SPECS/python-django-horizon.spec index b06a7e7..0047781 100644 --- a/rpm/SPECS/python-django-horizon.spec +++ b/rpm/SPECS/python-django-horizon.spec @@ -33,7 +33,6 @@ Patch0008: 0008-fix-up-issues-with-customization.patch Patch0009: 0009-do-not-truncate-the-logo-related-rhbz-877138.patch Patch0010: 0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch #mirantis OpenStack patch -Patch0100: mos-disable-metering.patch Patch0101: mos-fix-murano-savana-dashboard.patch @@ -163,7 +162,6 @@ Customization module for OpenStack Dashboard to provide a branded logo. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 -%patch0100 -p1 %patch0101 -p1 # remove unnecessary .po files -- 2.45.2