python-swiftclient

Merge lp:~zulcss/python-swiftclient/mock-fbtfs into lp:~ubuntu-server-dev/python-swiftclient/havana

  1. mock-fbtfs
  2. Merge into havana
Proposed by Chuck Short
Status: Merged
Merged at revision: 33
Proposed branch: lp:~zulcss/python-swiftclient/mock-fbtfs
Merge into: lp:~ubuntu-server-dev/python-swiftclient/havana
Diff against target: 29 lines (+7/-1)
2 files modified
debian/changelog (+6/-1)
debian/control (+1/-0)
To merge this branch: bzr merge lp:~zulcss/python-swiftclient/mock-fbtfs
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+174416@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

lgtm

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:08:34 +0000
3+++ debian/changelog 2013-07-12 14:00:36 +0000
4@@ -1,7 +1,12 @@
5-python-swiftclient (1:1.4.0-0ubuntu2) UNRELEASED; urgency=low
6+python-swiftclient (1:1.5.0.2.gc460ebf-0ubuntu1) UNRELEASED; urgency=low
7
8+ [ James Page ]
9 * d/control: Update VCS fields for new branch locations.
10
11+ [ Chuck Short ]
12+ * New upstream release.
13+ * debian/control: Add python-mock as a dependency.
14+
15 -- James Page <james.page@ubuntu.com> Tue, 09 Jul 2013 14:08:25 +0100
16
17 python-swiftclient (1:1.4.0-0ubuntu1) saucy; urgency=low
18
19=== modified file 'debian/control'
20--- debian/control 2013-07-09 13:08:34 +0000
21+++ debian/control 2013-07-12 14:00:36 +0000
22@@ -11,6 +11,7 @@
23 python-fixtures,
24 python-httplib2,
25 python-keystoneclient,
26+ python-mock,
27 python-nose,
28 python-pbr,
29 python-prettytable,

Subscribers

People subscribed via source and target branches