[python-django-horizon/el6-havana] Finish rebase to horizon-2013.2.rc2
Matthias Runge
mrunge at fedoraproject.org
Tue Oct 15 09:09:27 UTC 2013
commit aa5cd1ba8dd1ce93ff0480ffe14068edcc5222db
Author: Matthias Runge <mrunge at redhat.com>
Date: Tue Oct 15 11:06:33 2013 +0200
Finish rebase to horizon-2013.2.rc2
.gitignore | 1 +
...-Don-t-access-the-net-while-building-docs.patch | 2 +-
0002-disable-debug-move-web-root.patch | 6 +++---
...file-location-to-tmp-and-also-add-localho.patch | 4 ++--
...-Add-a-customization-module-based-on-RHOS.patch | 4 ++--
...oslo.sphinx-and-remove-local-copy-of-doc-.patch | 2 +-
...olicy-files-and-checks-to-etc-openstack-d.patch | 4 ++--
0007-move-SECRET_KEY-secret_key_store-to-tmp.patch | 4 ++--
0008-fix-up-issues-with-customization.patch | 2 +-
...not-truncate-the-logo-related-rhbz-877138.patch | 2 +-
...T_KEYSTORE-to-var-lib-openstack-dashboard.patch | 4 ++--
sources | 2 +-
12 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 40d9c8e..4c69101 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
/horizon-2013.2.b2.tar.gz
/horizon-2013.2.b3.tar.gz
/horizon-2013.2.rc1.tar.gz
+/horizon-2013.2.rc2.tar.gz
diff --git a/0001-Don-t-access-the-net-while-building-docs.patch b/0001-Don-t-access-the-net-while-building-docs.patch
index 7a09af5..54db585 100644
--- a/0001-Don-t-access-the-net-while-building-docs.patch
+++ b/0001-Don-t-access-the-net-while-building-docs.patch
@@ -1,4 +1,4 @@
-From a993b31582bd052a92b96a8ed50dd1bbcce05053 Mon Sep 17 00:00:00 2001
+From bbbc872af4ae54c2e80158da500950fefff057cb Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Fri, 5 Apr 2013 10:16:19 +0200
Subject: [PATCH] Don't access the net while building docs (Note this hasn't
diff --git a/0002-disable-debug-move-web-root.patch b/0002-disable-debug-move-web-root.patch
index d4dd489..2e2bde8 100644
--- a/0002-disable-debug-move-web-root.patch
+++ b/0002-disable-debug-move-web-root.patch
@@ -1,4 +1,4 @@
-From 3cc31a7ab2e7ffd89680f4b7472dd492fc54fa2d Mon Sep 17 00:00:00 2001
+From e05ddcad542ef0c291ae85544065c7ea17620417 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Fri, 5 Apr 2013 10:07:53 +0200
Subject: [PATCH] disable debug, move web root
@@ -9,7 +9,7 @@ Subject: [PATCH] disable debug, move web root
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index 6d333e2..11b02d6 100644
+index 6e426c9..d2db3cd 100644
--- a/openstack_dashboard/local/local_settings.py.example
+++ b/openstack_dashboard/local/local_settings.py.example
@@ -4,7 +4,7 @@ from django.utils.translation import ugettext_lazy as _
@@ -35,7 +35,7 @@ index 6d333e2..11b02d6 100644
# The OPENSTACK_NEUTRON_NETWORK settings can be used to enable optional
diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index 1216099..09a5ec3 100644
+index 852a895..84da859 100644
--- a/openstack_dashboard/settings.py
+++ b/openstack_dashboard/settings.py
@@ -31,7 +31,7 @@ warnings.formatwarning = lambda message, category, *args, **kwargs: \
diff --git a/0003-change-lockfile-location-to-tmp-and-also-add-localho.patch b/0003-change-lockfile-location-to-tmp-and-also-add-localho.patch
index 0a2c277..d6d2bb2 100644
--- a/0003-change-lockfile-location-to-tmp-and-also-add-localho.patch
+++ b/0003-change-lockfile-location-to-tmp-and-also-add-localho.patch
@@ -1,4 +1,4 @@
-From bece01fd2bb6c3844b369b977b4af67f29352235 Mon Sep 17 00:00:00 2001
+From 91577496c34cb3cf99b55a452d589e86e07e80f5 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Thu, 25 Jul 2013 11:32:38 +0200
Subject: [PATCH] change lockfile location to '/tmp' and also add localhost to
@@ -9,7 +9,7 @@ Subject: [PATCH] change lockfile location to '/tmp' and also add localhost to
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index 11b02d6..cbf3d9b 100644
+index d2db3cd..d386d46 100644
--- a/openstack_dashboard/local/local_settings.py.example
+++ b/openstack_dashboard/local/local_settings.py.example
@@ -12,7 +12,7 @@ TEMPLATE_DEBUG = DEBUG
diff --git a/0004-Add-a-customization-module-based-on-RHOS.patch b/0004-Add-a-customization-module-based-on-RHOS.patch
index c33266c..1306e18 100644
--- a/0004-Add-a-customization-module-based-on-RHOS.patch
+++ b/0004-Add-a-customization-module-based-on-RHOS.patch
@@ -1,4 +1,4 @@
-From a08b8f8fd6e4c86d918e2053b5bd181abb3d0e87 Mon Sep 17 00:00:00 2001
+From 7cee6246a734596b406c89164d8eaee0bf8d4646 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Thu, 14 Feb 2013 12:55:54 +0100
Subject: [PATCH] Add a customization module based on RHOS
@@ -28,7 +28,7 @@ Conflicts:
create mode 100644 openstack_dashboard_theme/templates/splash.html
diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index 09a5ec3..20edb90 100644
+index 84da859..cc40815 100644
--- a/openstack_dashboard/settings.py
+++ b/openstack_dashboard/settings.py
@@ -119,14 +119,13 @@ TEMPLATE_CONTEXT_PROCESSORS = (
diff --git a/0005-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch b/0005-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
index 1726977..0df5eec 100644
--- a/0005-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
+++ b/0005-Revert-Use-oslo.sphinx-and-remove-local-copy-of-doc-.patch
@@ -1,4 +1,4 @@
-From 3681cec52e0a20183ec22ac69bb8abcbf41dee06 Mon Sep 17 00:00:00 2001
+From 952af8fe119460efe080df393238351205283b70 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Mon, 9 Sep 2013 13:51:19 +0200
Subject: [PATCH] Revert "Use oslo.sphinx and remove local copy of doc theme"
diff --git a/0006-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch b/0006-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
index c3e7f55..e52e236 100644
--- a/0006-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
+++ b/0006-move-RBAC-policy-files-and-checks-to-etc-openstack-d.patch
@@ -1,4 +1,4 @@
-From 5a2c2139a821c865f8b9de9501453ddd33d27b4b Mon Sep 17 00:00:00 2001
+From 562e0ac5b40148f2fc4ecfabcc2381221d6ad356 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Mon, 9 Sep 2013 14:13:07 +0200
Subject: [PATCH] move RBAC policy files and checks to /etc/openstack-dashboard
@@ -8,7 +8,7 @@ Subject: [PATCH] move RBAC policy files and checks to /etc/openstack-dashboard
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index cbf3d9b..e899a1e 100644
+index d386d46..afa95f1 100644
--- a/openstack_dashboard/local/local_settings.py.example
+++ b/openstack_dashboard/local/local_settings.py.example
@@ -228,12 +228,13 @@ TIME_ZONE = "UTC"
diff --git a/0007-move-SECRET_KEY-secret_key_store-to-tmp.patch b/0007-move-SECRET_KEY-secret_key_store-to-tmp.patch
index f2b929d..2f55107 100644
--- a/0007-move-SECRET_KEY-secret_key_store-to-tmp.patch
+++ b/0007-move-SECRET_KEY-secret_key_store-to-tmp.patch
@@ -1,4 +1,4 @@
-From c2e14bdee9684c3c9ee8ba1bb6be0a580c4af904 Mon Sep 17 00:00:00 2001
+From c2abf226536538beae508c478341cf4293042d3a Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Mon, 9 Sep 2013 20:52:51 +0200
Subject: [PATCH] move SECRET_KEY secret_key_store to /tmp
@@ -8,7 +8,7 @@ Subject: [PATCH] move SECRET_KEY secret_key_store to /tmp
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index e899a1e..7334be0 100644
+index afa95f1..d120dfc 100644
--- a/openstack_dashboard/local/local_settings.py.example
+++ b/openstack_dashboard/local/local_settings.py.example
@@ -77,7 +77,6 @@ HORIZON_CONFIG = {
diff --git a/0008-fix-up-issues-with-customization.patch b/0008-fix-up-issues-with-customization.patch
index 74cabd7..b909219 100644
--- a/0008-fix-up-issues-with-customization.patch
+++ b/0008-fix-up-issues-with-customization.patch
@@ -1,4 +1,4 @@
-From c82f4ea6134d579ca3b7b3c6ebea81d1a15f870e Mon Sep 17 00:00:00 2001
+From 9bc30f177adec2372d85e113fbecfb3cf9105aa0 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Thu, 19 Sep 2013 12:58:00 +0200
Subject: [PATCH] fix up issues with customization
diff --git a/0009-do-not-truncate-the-logo-related-rhbz-877138.patch b/0009-do-not-truncate-the-logo-related-rhbz-877138.patch
index 2bbcf57..b46a09e 100644
--- a/0009-do-not-truncate-the-logo-related-rhbz-877138.patch
+++ b/0009-do-not-truncate-the-logo-related-rhbz-877138.patch
@@ -1,4 +1,4 @@
-From eb46f4b4265fded3d5908d34de2ccef1892edde1 Mon Sep 17 00:00:00 2001
+From c6e5b9b183231fc451e4b0bae4fc7bd7f6ee9082 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Thu, 19 Sep 2013 13:58:16 +0200
Subject: [PATCH] do not truncate the logo (related rhbz 877138)
diff --git a/0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch b/0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
index c67894b..6abc711 100644
--- a/0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
+++ b/0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch
@@ -1,4 +1,4 @@
-From dea4dfb6ba5d47a758cdbe93315a95922f9be0bf Mon Sep 17 00:00:00 2001
+From 015782113baf9f117cea694ec1a5489196942d46 Mon Sep 17 00:00:00 2001
From: Matthias Runge <mrunge at redhat.com>
Date: Fri, 4 Oct 2013 09:46:36 +0200
Subject: [PATCH] move SECRET_KEYSTORE to '/var/lib/openstack-dashboard'
@@ -8,7 +8,7 @@ Subject: [PATCH] move SECRET_KEYSTORE to '/var/lib/openstack-dashboard'
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index 7334be0..8284633 100644
+index d120dfc..a60ad0c 100644
--- a/openstack_dashboard/local/local_settings.py.example
+++ b/openstack_dashboard/local/local_settings.py.example
@@ -88,7 +88,7 @@ HORIZON_CONFIG = {
diff --git a/sources b/sources
index 2297640..1a83846 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bfa50aecd6d20b108cb3fcbc9f54b1b1 horizon-2013.2.rc1.tar.gz
+46bde85a3f80a198c67f4a56cf625b57 horizon-2013.2.rc2.tar.gz
More information about the scm-commits
mailing list