OpenStack Compute (nova)

Merge lp:~zulcss/nova/noava-ftbfs-refresh into lp:~openstack-ubuntu-testing/nova/havana

  1. noava-ftbfs-refresh
  2. Merge into havana
Proposed by Chuck Short
Status: Merged
Approved by: Yolanda Robla
Approved revision: 576
Merged at revision: 576
Proposed branch: lp:~zulcss/nova/noava-ftbfs-refresh
Merge into: lp:~openstack-ubuntu-testing/nova/havana
Diff against target: 55 lines (+3/-16)
4 files modified
debian/changelog (+3/-1)
debian/control (+0/-1)
debian/patches/fix-ubuntu-tests.patch (+0/-13)
debian/patches/series (+0/-1)
To merge this branch: bzr merge lp:~zulcss/nova/noava-ftbfs-refresh
Reviewer Review Type Date Requested Status
Yolanda Robla (community) Approve
Review via email: mp+164650@code.launchpad.net

Description of the change

fixes ftbfs

To post a comment you must log in.
Revision history for this message
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/changelog'
2--- debian/changelog 2013-05-13 17:07:29 +0000
3+++ debian/changelog 2013-05-19 22:00:33 +0000
4@@ -1,9 +1,11 @@
5-nova (1:2013.2.a613.gda1d739-0ubuntu1) UNRELEASED; urgency=low
6+nova (1:2013.2.a732.g7063896-0ubuntu1) UNRELEASED; urgency=low
7
8 * New upstream version.
9 * debian/patches/avoid_setuptools_git_dependency.patch: Dropped
10 no longer needed.
11 * debian/control: Add python-pbr and python-d2to1 as build dependencies.
12+ * debian/control: Drop pep8 dependency.
13+ * debian/patches/fix-ubuntu-tests.patch: Dropped no longer needed.
14
15 -- Chuck Short <zulcss@ubuntu.com> Mon, 13 May 2013 11:37:26 -0500
16
17
18=== modified file 'debian/control'
19--- debian/control 2013-05-13 17:01:49 +0000
20+++ debian/control 2013-05-19 22:00:33 +0000
21@@ -46,7 +46,6 @@
22 python-testtools (>= 0.9.22),
23 python-unittest2,
24 python-webob (>= 1.2.3),
25- pep8,
26 sqlite3,
27 testrepository ( >= 0.0.8)
28 Build-Conflicts: python-cjson
29
30=== removed file 'debian/patches/fix-ubuntu-tests.patch'
31--- debian/patches/fix-ubuntu-tests.patch 2013-03-14 00:48:45 +0000
32+++ debian/patches/fix-ubuntu-tests.patch 1970-01-01 00:00:00 +0000
33@@ -1,13 +0,0 @@
34-Index: nova/tools/hacking.py
35-===================================================================
36---- nova.orig/tools/hacking.py 2013-03-13 17:47:30.280806436 -0700
37-+++ nova/tools/hacking.py 2013-03-13 17:47:36.364806745 -0700
38-@@ -646,7 +646,7 @@
39- #include nova path
40- sys.path.append(os.getcwd())
41- #Run once tests (not per line)
42-- once_error = once_git_check_commit_title()
43-+ #once_error = once_git_check_commit_title()
44- #NOVA error codes start with an N
45- pep8.SELFTEST_REGEX = re.compile(r'(Okay|[EWN]\d{3}):\s(.*)')
46- pep8.ERRORCODE_REGEX = re.compile(r'[EWN]\d{3}')
47
48=== modified file 'debian/patches/series'
49--- debian/patches/series 2013-05-13 17:01:49 +0000
50+++ debian/patches/series 2013-05-19 22:00:33 +0000
51@@ -1,4 +1,3 @@
52 # Ubuntu specific patches below here. Note these can be dropped eventually.
53 path-to-the-xenhost.conf-fixup.patch
54-fix-ubuntu-tests.patch
55 fix-docs-build-without-network.patch

Subscribers

People subscribed via source and target branches