python-ceilometerclient

Merge lp:~zulcss/python-ceilometerclient/havna-fbtfs-pbr into lp:~openstack-ubuntu-testing/python-ceilometerclient/havana

  1. havna-fbtfs-pbr
  2. Merge into havana
Proposed by Chuck Short
Status: Merged
Approved by: Yolanda Robla
Approved revision: 9
Merged at revision: 9
Proposed branch: lp:~zulcss/python-ceilometerclient/havna-fbtfs-pbr
Merge into: lp:~openstack-ubuntu-testing/python-ceilometerclient/havana
Diff against target: 41 lines (+6/-3)
2 files modified
debian/changelog (+4/-2)
debian/control (+2/-1)
To merge this branch: bzr merge lp:~zulcss/python-ceilometerclient/havna-fbtfs-pbr
Reviewer Review Type Date Requested Status
Yolanda Robla (community) Approve
Review via email: mp+165947@code.launchpad.net
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-15 14:38:57 +0000
3+++ debian/changelog 2013-05-28 00:14:24 +0000
4@@ -1,11 +1,13 @@
5-python-ceilometerclient (1.0.0.16.g7091db4-0ubuntu1) UNRELEASED; urgency=low
6+python-ceilometerclient (1.0.0.33.gf9af1f3-0ubuntu1) UNRELEASED; urgency=low
7
8 * New upstream release.
9 * debian/control:
10 - Dropped python-unittest2, python-nose.
11 - Added python-coverage, python-fixtures, python-subunit,
12- python-testtools, python-testrepository
13+ python-testtools, python-testrepository, python-d2to1,
14+ python-pbr
15 - Dropped duplicate python-setuptools-git
16+ - Dropped pep8.
17 * debian/rules: Convert testsuite to use testr.
18
19 -- Chuck Short <zulcss@ubuntu.com> Wed, 15 May 2013 09:24:24 -0500
20
21=== modified file 'debian/control'
22--- debian/control 2013-05-15 14:38:57 +0000
23+++ debian/control 2013-05-28 00:14:24 +0000
24@@ -5,6 +5,7 @@
25 Build-Depends: debhelper (>= 8.0.0),
26 python-all (>= 2.6.6-3~),
27 python-coverage,
28+ python-d2to1,
29 python-fixtures,
30 python-subunit,
31 python-setuptools,
32@@ -13,8 +14,8 @@
33 python-keystoneclient,
34 python-httplib2,
35 python-iso8601,
36+ python-pbr,
37 python-mox,
38- pep8,
39 python-sphinx,
40 testrepository,
41 python-testtools

Subscribers

People subscribed via source and target branches