[python-django-horizon] Updated patches from master-patches

[Matthias Runge]

commit 30527184d2f6d9298efc95555b591cee7e011f5e
Author: Matthias Runge <mrunge at redhat.com>
Date:   Mon May 5 12:27:54 2014 +0200

    Updated patches from master-patches

 ...ing-comma-in-Volume-ResourceWrapper-class.patch |   26 ++++++++++++++++++++
 ... => 0011-remove-runtime-dep-to-python-pbr.patch |    3 --
 python-django-horizon.spec                         |    3 +-
 3 files changed, 28 insertions(+), 4 deletions(-)
---
diff --git a/0010-Add-missing-comma-in-Volume-ResourceWrapper-class.patch b/0010-Add-missing-comma-in-Volume-ResourceWrapper-class.patch
new file mode 100644
index 0000000..7689507
--- /dev/null
+++ b/0010-Add-missing-comma-in-Volume-ResourceWrapper-class.patch
@@ -0,0 +1,26 @@
+From 8fdd40b6f51c56d7c04d9d1a41c85bbce40925c4 Mon Sep 17 00:00:00 2001
+From: Lin Hua Cheng <lin-hua.cheng at hp.com>
+Date: Wed, 16 Apr 2014 09:36:27 -0700
+Subject: [PATCH] Add missing comma in Volume ResourceWrapper class
+
+Change-Id: Ie0b0f40966f6bf98f693a971fdb498537842b21e
+Closes-Bug: #1308642
+(cherry picked from commit c45449c3a979c15ae414934fe162fbb4f0502ba0)
+(cherry picked from commit fbd5b2e3668989a78f55e1a16a5ab0455d1acb83)
+---
+ openstack_dashboard/api/cinder.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/openstack_dashboard/api/cinder.py b/openstack_dashboard/api/cinder.py
+index 1860a6d..71ba1a2 100644
+--- a/openstack_dashboard/api/cinder.py
++++ b/openstack_dashboard/api/cinder.py
+@@ -78,7 +78,7 @@ class BaseCinderAPIResourceWrapper(base.APIResourceWrapper):
+ class Volume(BaseCinderAPIResourceWrapper):
+ 
+     _attrs = ['id', 'name', 'description', 'size', 'status', 'created_at',
+-              'volume_type', 'availability_zone', 'imageRef', 'bootable'
++              'volume_type', 'availability_zone', 'imageRef', 'bootable',
+               'snapshot_id', 'source_volid', 'attachments', 'tenant_name',
+               'os-vol-host-attr:host', 'os-vol-tenant-attr:tenant_id',
+               'metadata']
diff --git a/9999-remove-runtime-dep-to-python-pbr.patch b/0011-remove-runtime-dep-to-python-pbr.patch
similarity index 98%
rename from 9999-remove-runtime-dep-to-python-pbr.patch
rename to 0011-remove-runtime-dep-to-python-pbr.patch
index 1d58088..4c6df46 100644
--- a/9999-remove-runtime-dep-to-python-pbr.patch
+++ b/0011-remove-runtime-dep-to-python-pbr.patch
@@ -31,6 +31,3 @@ index 972f6ce..a129ea2 100644
 +        return self.release
 +
 +version_info = VersionInfo()
--- 
-1.9.0
-
diff --git a/python-django-horizon.spec b/python-django-horizon.spec
index 529b548..1769f71 100644
--- a/python-django-horizon.spec
+++ b/python-django-horizon.spec
@@ -27,8 +27,9 @@ Patch0006: 0006-move-SECRET_KEY-secret_key_store-to-tmp.patch
 Patch0007: 0007-RCUE-navbar-and-login-screen.patch
 Patch0008: 0008-Added-a-hook-for-redhat-openstack-access-plugin.patch
 Patch0009: 0009-fix-flake8-issues.patch
+Patch0010: 0010-Add-missing-comma-in-Volume-ResourceWrapper-class.patch
+Patch0011: 0011-remove-runtime-dep-to-python-pbr.patch
 
-Patch9999: 9999-remove-runtime-dep-to-python-pbr.patch
 
 
 #