[python-django-horizon] Update/rebase to Havana-2 snapshot

Matthias Runge mrunge at fedoraproject.org
Mon Jul 22 09:29:40 UTC 2013


commit e6d284a39e053e9016859d1208128d0fe50c0d86
Author: Matthias Runge <mrunge at redhat.com>
Date:   Mon Jul 22 11:24:45 2013 +0200

    Update/rebase to Havana-2 snapshot

 ...-Don-t-access-the-net-while-building-docs.patch |    2 +-
 0002-disable-debug-move-web-root.patch             |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
---
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 c94b521..7ca49df 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 ba1ba0020a81ca144e705a51c9f6b5dace0f30bf Mon Sep 17 00:00:00 2001
+From 4d9ab732c9a60c07158b799117db7d5fbf4fa05a 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 30387fb..9c0b0c6 100644
--- a/0002-disable-debug-move-web-root.patch
+++ b/0002-disable-debug-move-web-root.patch
@@ -1,4 +1,4 @@
-From 49d587ea6b374f10e7150b2d1043cf525664ca49 Mon Sep 17 00:00:00 2001
+From 796abb7ce7b94ff98aacf5233870f0afcfe786c4 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, 9 insertions(+), 7 deletions(-)
 
 diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example
-index 8ee9495..b743d0e 100644
+index 4494b69..3f5da3d 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 _
@@ -21,7 +21,7 @@ index 8ee9495..b743d0e 100644
  TEMPLATE_DEBUG = DEBUG
  
  # Required for Django 1.5.
-@@ -143,7 +143,7 @@ OPENSTACK_KEYSTONE_BACKEND = {
+@@ -147,7 +147,7 @@ OPENSTACK_KEYSTONE_BACKEND = {
  }
  
  OPENSTACK_HYPERVISOR_FEATURES = {
@@ -31,7 +31,7 @@ index 8ee9495..b743d0e 100644
      # NOTE: as of Grizzly this is not yet supported in Nova so enabling this
      # setting will not do anything useful
 diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py
-index 254f0ce..cae6247 100644
+index 9613f58..02ac8ba 100644
 --- a/openstack_dashboard/settings.py
 +++ b/openstack_dashboard/settings.py
 @@ -29,7 +29,7 @@ warnings.formatwarning = lambda message, category, *args, **kwargs: \


More information about the scm-commits mailing list