Ubuntu CI Dashboard

Merge lp:~cjohnston/qa-dashboard/defaults-missed into lp:qa-dashboard

  1. defaults-missed
  2. Merge into dev
Proposed by Chris Johnston
Status: Merged
Approved by: Chris Johnston
Approved revision: 615
Merged at revision: 615
Proposed branch: lp:~cjohnston/qa-dashboard/defaults-missed
Merge into: lp:qa-dashboard
Diff against target: 139 lines (+8/-44)
8 files modified
bootspeed/dashboard.py (+1/-5)
eventstat/dashboard.py (+1/-5)
idle_power/dashboard.py (+1/-5)
memevent/dashboard.py (+1/-5)
memory/dashboard.py (+1/-6)
power/dashboard.py (+1/-6)
smokeng/dashboard.py (+1/-6)
sru/dashboard.py (+1/-6)
To merge this branch: bzr merge lp:~cjohnston/qa-dashboard/defaults-missed
Reviewer Review Type Date Requested Status
Joe Talbott Approve
Review via email: mp+188135@code.launchpad.net

Commit message

Switches the dashboard.py django.conf.urls

To post a comment you must log in.
Revision history for this message
Joe Talbott (joetalbott) wrote :

Who reviewed the first one? :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bootspeed/dashboard.py'
2--- bootspeed/dashboard.py 2013-07-30 18:35:31 +0000
3+++ bootspeed/dashboard.py 2013-09-27 18:56:24 +0000
4@@ -13,11 +13,7 @@
5 # You should have received a copy of the GNU Affero General Public License
6 # along with this program. If not, see <http://www.gnu.org/licenses/>.
7
8-from django.conf.urls.defaults import (
9- include,
10- patterns,
11- url,
12-)
13+from django.conf.urls import include, patterns, url
14 from django.core.management import call_command
15 from django.core.urlresolvers import reverse_lazy
16 from django.db import models
17
18=== modified file 'eventstat/dashboard.py'
19--- eventstat/dashboard.py 2013-07-24 14:20:14 +0000
20+++ eventstat/dashboard.py 2013-09-27 18:56:24 +0000
21@@ -13,11 +13,7 @@
22 # You should have received a copy of the GNU Affero General Public License
23 # along with this program. If not, see <http://www.gnu.org/licenses/>.
24
25-from django.conf.urls.defaults import (
26- include,
27- patterns,
28- url,
29-)
30+from django.conf.urls import include, patterns, url
31 from django.core.management import call_command
32 from django.db import models
33 from django.template.loader import render_to_string
34
35=== modified file 'idle_power/dashboard.py'
36--- idle_power/dashboard.py 2013-07-30 01:41:09 +0000
37+++ idle_power/dashboard.py 2013-09-27 18:56:24 +0000
38@@ -13,11 +13,7 @@
39 # You should have received a copy of the GNU Affero General Public License
40 # along with this program. If not, see <http://www.gnu.org/licenses/>.
41
42-from django.conf.urls.defaults import (
43- include,
44- patterns,
45- url,
46-)
47+from django.conf.urls import include, patterns, url
48
49 from common.plugin_helper import (
50 Extension,
51
52=== modified file 'memevent/dashboard.py'
53--- memevent/dashboard.py 2013-07-30 01:41:09 +0000
54+++ memevent/dashboard.py 2013-09-27 18:56:24 +0000
55@@ -13,11 +13,7 @@
56 # You should have received a copy of the GNU Affero General Public License
57 # along with this program. If not, see <http://www.gnu.org/licenses/>.
58
59-from django.conf.urls.defaults import (
60- include,
61- patterns,
62- url,
63-)
64+from django.conf.urls import include, patterns, url
65
66 from common.plugin_helper import (
67 Extension,
68
69=== modified file 'memory/dashboard.py'
70--- memory/dashboard.py 2013-07-30 18:35:31 +0000
71+++ memory/dashboard.py 2013-09-27 18:56:24 +0000
72@@ -13,12 +13,7 @@
73 # You should have received a copy of the GNU Affero General Public License
74 # along with this program. If not, see <http://www.gnu.org/licenses/>.
75
76-from django.conf.urls.defaults import (
77- include,
78- patterns,
79- url,
80-)
81-
82+from django.conf.urls import include, patterns, url
83 from django.core.urlresolvers import reverse_lazy
84
85 from common.plugin_helper import (
86
87=== modified file 'power/dashboard.py'
88--- power/dashboard.py 2013-07-30 18:35:31 +0000
89+++ power/dashboard.py 2013-09-27 18:56:24 +0000
90@@ -13,12 +13,7 @@
91 # You should have received a copy of the GNU Affero General Public License
92 # along with this program. If not, see <http://www.gnu.org/licenses/>.
93
94-from django.conf.urls.defaults import (
95- include,
96- patterns,
97- url,
98-)
99-
100+from django.conf.urls import include, patterns, url
101 from django.core.urlresolvers import reverse_lazy
102
103 from common.plugin_helper import (
104
105=== modified file 'smokeng/dashboard.py'
106--- smokeng/dashboard.py 2013-09-27 17:11:48 +0000
107+++ smokeng/dashboard.py 2013-09-27 18:56:24 +0000
108@@ -13,12 +13,7 @@
109 # You should have received a copy of the GNU Affero General Public License
110 # along with this program. If not, see <http://www.gnu.org/licenses/>.
111
112-from django.conf.urls.defaults import (
113- include,
114- patterns,
115- url,
116-)
117-
118+from django.conf.urls import include, patterns, url
119 from django.core.management import call_command
120 from django.core.urlresolvers import reverse_lazy
121 from django.db import models
122
123=== modified file 'sru/dashboard.py'
124--- sru/dashboard.py 2013-07-30 18:35:31 +0000
125+++ sru/dashboard.py 2013-09-27 18:56:24 +0000
126@@ -13,12 +13,7 @@
127 # You should have received a copy of the GNU Affero General Public License
128 # along with this program. If not, see <http://www.gnu.org/licenses/>.
129
130-from django.conf.urls.defaults import (
131- include,
132- patterns,
133- url,
134-)
135-
136+from django.conf.urls import include, patterns, url
137 from django.core.urlresolvers import reverse_lazy
138
139 from common.plugin_helper import (

Subscribers

People subscribed via source and target branches