Merge lp:~james-page/horizon/memcache-fixup into lp:~openstack-ubuntu-testing/horizon/grizzly

Proposed by James Page on 2013-03-13
Status: Merged
Approved by: Yolanda Robla on 2013-03-13
Approved revision: 145
Merged at revision: 145
Proposed branch: lp:~james-page/horizon/memcache-fixup
Merge into: lp:~openstack-ubuntu-testing/horizon/grizzly
Diff against target: 36 lines (+9/-9)
1 file modified
debian/patches/ubuntu_local_settings.patch (+9/-9)
To merge this branch: bzr merge lp:~james-page/horizon/memcache-fixup
Reviewer Review Type Date Requested Status
Yolanda Robla (community) 2013-03-13 Approve on 2013-03-13
Review via email: mp+153109@code.launchpad.net

Description of the change

Fixup broken memcached configuration

To post a comment you must log in.
Yolanda Robla (yolanda.robla) wrote :

Looks good to me

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/patches/ubuntu_local_settings.patch'
2--- debian/patches/ubuntu_local_settings.patch 2013-03-12 19:48:25 +0000
3+++ debian/patches/ubuntu_local_settings.patch 2013-03-13 11:42:23 +0000
4@@ -1,8 +1,6 @@
5-Index: horizon/openstack_dashboard/local/local_settings.py.example
6-===================================================================
7---- horizon.orig/openstack_dashboard/local/local_settings.py.example 2013-03-12 12:43:30.000000000 -0700
8-+++ horizon/openstack_dashboard/local/local_settings.py.example 2013-03-12 12:45:17.159499422 -0700
9-@@ -4,7 +4,7 @@
10+--- a/openstack_dashboard/local/local_settings.py.example
11++++ b/openstack_dashboard/local/local_settings.py.example
12+@@ -4,7 +4,7 @@ from django.utils.translation import uge
13
14 from openstack_dashboard import exceptions
15
16@@ -11,15 +9,17 @@
17 TEMPLATE_DEBUG = DEBUG
18
19 # Set SSL proxy settings:
20-@@ -68,6 +68,7 @@
21+@@ -67,7 +67,8 @@ LOCAL_PATH = os.path.dirname(os.path.abs
22+
23 CACHES = {
24 'default': {
25- 'BACKEND' : 'django.core.cache.backends.locmem.LocMemCache'
26-+ 'LOCATION' : '127.0.0.1:11211',
27+- 'BACKEND' : 'django.core.cache.backends.locmem.LocMemCache'
28++ 'BACKEND' : 'django.core.cache.backends.memcached.MemcachedCache',
29++ 'LOCATION' : '127.0.0.1:11211'
30 }
31 }
32
33-@@ -76,6 +77,22 @@
34+@@ -76,6 +77,22 @@ EMAIL_BACKEND = 'django.core.mail.backen
35 # Or send them to /dev/null
36 #EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'
37

Subscribers

People subscribed via source and target branches