Merge lp:~gandelman-a/ubuntu/raring/horizon/caches into lp:~openstack-ubuntu-testing/horizon/grizzly

[Adam Gandelman]

Patch needs refreshing to move memcache server location to the CACHES dict, as per https://review.openstack.org/#/c/23904/

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-01 14:14:52 +0000
+++ debian/changelog	2013-03-12 19:50:25 +0000
@@ -1,9 +1,14 @@
-horizon (2013.1.g3-0ubuntu3) UNRELEASED; urgency=low
+horizon (2013.1.g3-0ubuntu4) UNRELEASED; urgency=low
 
+  [ James Page ]
   * d/watch: Update uversionmangle to deal with upstream versioning
     changes, remove tarballs.openstack.org.
 
- -- James Page <[e-mail]>  Fri, 01 Mar 2013 14:11:51 +0000
+  [ Adam Gandelman ]
+  * debian/patches/ubuntu_local_settings.py: Refresh, specify memcache
+    location as part of CACHES, as per upstream changes to example config.
+
+ -- Adam Gandelman <[e-mail]>  Tue, 12 Mar 2013 12:47:45 -0700
 
 horizon (2013.1.g3-0ubuntu2) raring; urgency=low
 

=== modified file 'debian/patches/ubuntu_local_settings.patch'
--- debian/patches/ubuntu_local_settings.patch	2012-11-21 18:39:13 +0000
+++ debian/patches/ubuntu_local_settings.patch	2013-03-12 19:50:25 +0000
@@ -1,7 +1,8 @@
-diff -Naurp horizon-2013.1.orig/openstack_dashboard/local/local_settings.py.example horizon-2013.1/openstack_dashboard/local/local_settings.py.example
---- horizon-2013.1.orig/openstack_dashboard/local/local_settings.py.example	2012-11-20 22:59:38.000000000 -0600
-+++ horizon-2013.1/openstack_dashboard/local/local_settings.py.example	2012-11-21 12:35:19.701240407 -0600
-@@ -4,7 +4,7 @@ from django.utils.translation import uge
+Index: horizon/openstack_dashboard/local/local_settings.py.example
+===================================================================
+--- horizon.orig/openstack_dashboard/local/local_settings.py.example	2013-03-12 12:43:30.000000000 -0700
++++ horizon/openstack_dashboard/local/local_settings.py.example	2013-03-12 12:45:17.159499422 -0700
+@@ -4,7 +4,7 @@
  
  from openstack_dashboard import exceptions
  
@@ -10,15 +11,15 @@
  TEMPLATE_DEBUG = DEBUG
  
  # Set SSL proxy settings:
-@@ -49,13 +49,29 @@ LOCAL_PATH = os.path.dirname(os.path.abs
- # We recommend you use memcached for development; otherwise after every reload
- # of the django development server, you will have to login again. To use
- # memcached set CACHE_BACKED to something like 'memcached://127.0.0.1:11211/'
--CACHE_BACKEND = 'locmem://'
-+CACHE_BACKEND = 'memcached://127.0.0.1:11211'
+@@ -68,6 +68,7 @@
+ CACHES = {
+     'default': {
+         'BACKEND' : 'django.core.cache.backends.locmem.LocMemCache'
++        'LOCATION' : '127.0.0.1:11211',
+     }
+ }
  
- # Send email to the console by default
- EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
+@@ -76,6 +77,22 @@
  # Or send them to /dev/null
  #EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'