Merge lp:~zulcss/python-ceilometerclient/readme into lp:~ubuntu-server-dev/python-ceilometerclient/havana

Proposed by Chuck Short
Status: Merged
Merged at revision: 12
Proposed branch: lp:~zulcss/python-ceilometerclient/readme
Merge into: lp:~ubuntu-server-dev/python-ceilometerclient/havana
Diff against target: 24 lines (+3/-2)
2 files modified
debian/changelog (+2/-1)
debian/docs (+1/-1)
To merge this branch: bzr merge lp:~zulcss/python-ceilometerclient/readme
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+175056@code.launchpad.net
To post a comment you must log in.
Revision history for this message
James Page (james-page) :
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-07-09 13:10:33 +0000
3+++ debian/changelog 2013-07-16 16:09:36 +0000
4@@ -1,4 +1,4 @@
5-python-ceilometerclient (1.0.0.33.gf9af1f3-0ubuntu1) UNRELEASED; urgency=low
6+python-ceilometerclient (1.0.1.9.gefd67de-0ubuntu1) UNRELEASED; urgency=low
7
8 [ Chuck Short ]
9 * New upstream release.
10@@ -10,6 +10,7 @@
11 - Dropped duplicate python-setuptools-git
12 - Dropped pep8.
13 * debian/rules: Convert testsuite to use testr.
14+ * debian/docs: Update
15
16 [ Yolanda Robla ]
17 * debian/tests: added autopkg tests
18
19=== modified file 'debian/docs'
20--- debian/docs 2013-03-28 12:49:39 +0000
21+++ debian/docs 2013-07-16 16:09:36 +0000
22@@ -1,1 +1,1 @@
23-README.md
24+README.rst

Subscribers

People subscribed via source and target branches