OpenStack Object Storage (swift)

Merge lp:~gnuoy/swift/juno-update-deps into lp:~ubuntu-server-dev/swift/juno

  1. juno-update-deps
  2. Merge into juno
Proposed by Liam Young
Status: Needs review
Proposed branch: lp:~gnuoy/swift/juno-update-deps
Merge into: lp:~ubuntu-server-dev/swift/juno
Diff against target: 61 lines (+13/-9)
2 files modified
debian/changelog (+6/-2)
debian/control (+7/-7)
To merge this branch: bzr merge lp:~gnuoy/swift/juno-update-deps
Reviewer Review Type Date Requested Status
Liam Young (community) Needs Resubmitting
Chuck Short (community) Needs Fixing
Review via email: mp+225675@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Chuck Short (zulcss) wrote :

See comments.

review: Needs Fixing
Reply
Revision history for this message
Liam Young (gnuoy) :
review: Needs Resubmitting
Reply
Revision history for this message
Chuck Short (zulcss) wrote :

Can you resync this branch please?

chuck

review: Needs Fixing
Reply
lp:~gnuoy/swift/juno-update-deps updated
189. By Liam Young

Merged trunk in

Revision history for this message
Liam Young (gnuoy) :
review: Needs Resubmitting
Reply

Unmerged revisions

189. By Liam Young

Merged trunk in

188. By Liam Young

debian/control: Merged in deps from requirements.txt

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-07-03 13:02:20 +0000
+++ debian/changelog 2014-07-07 14:30:27 +0000
@@ -1,11 +1,15 @@
1swift (1.13.1-0ubuntu2) UNRELEASED; urgency=medium1swift (1.13.1-0ubuntu3) UNRELEASED; urgency=medium
22
3 [ Chuck Short ]
3 * debian/control: Open up juno release4 * debian/control: Open up juno release
4 * debian/patches/ring-perms.patch: Dropped no longer needed.5 * debian/patches/ring-perms.patch: Dropped no longer needed.
5 * debian/switf-container.install: Add swift-reconciler-enqueue6 * debian/switf-container.install: Add swift-reconciler-enqueue
6 and swift-container-reconciler.7 and swift-container-reconciler.
78
8 -- Chuck Short <zulcss@ubuntu.com> Tue, 22 Apr 2014 11:28:13 -04009 [ Liam Young ]
10 * debian/control: Merged in deps from requirements.txt
11
12 -- Liam Young <liam.young@canonical.com> Mon, 07 Jul 2014 15:19:36 +0100
913
10swift (1.13.1-0ubuntu1) trusty; urgency=medium14swift (1.13.1-0ubuntu1) trusty; urgency=medium
1115
1216
=== modified file 'debian/control'
--- debian/control 2014-04-22 15:28:14 +0000
+++ debian/control 2014-07-07 14:30:27 +0000
@@ -13,19 +13,19 @@
13 debhelper (>= 7.0.50~),13 debhelper (>= 7.0.50~),
14 python-all-dev (>= 2.6.6-3~),14 python-all-dev (>= 2.6.6-3~),
15 python-dnspython (>= 1.10.0),15 python-dnspython (>= 1.10.0),
16 python-eventlet (>= 0.9.8),16 python-eventlet (>= 0.9.15),
17 python-greenlet (>= 0.3.1),17 python-greenlet (>= 0.3.1),
18 python-mock,18 python-mock,
19 python-netifaces,19 python-netifaces (>> 0.10.1),
20 python-nose,20 python-nose,
21 python-openssl,21 python-openssl,
22 python-paste,22 python-paste,
23 python-pastedeploy,23 python-pastedeploy (>= 1.3.3),
24 python-setuptools,24 python-setuptools,
25 python-simplejson,25 python-simplejson (>= 2.0.9),
26 python-sphinx (>= 1.0),26 python-sphinx (>= 1.0),
27 python-swiftclient,27 python-swiftclient,
28 python-xattr28 python-xattr (>= 0.4)
29Standards-Version: 3.9.429Standards-Version: 3.9.4
30Homepage: http://launchpad.net/swift30Homepage: http://launchpad.net/swift
31Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/swift/juno/files31Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/swift/juno/files
@@ -150,8 +150,8 @@
150 ${python:Depends},150 ${python:Depends},
151 ${shlibs:Depends}151 ${shlibs:Depends}
152Provides: ${python:Provides}152Provides: ${python:Provides}
153Breaks: swift-object (<< 1.12.0-0ubuntu2), swift (<< 1.13.1~rc1-0ubuntu1~)153Breaks: swift (<< 1.13.1~rc1-0ubuntu1~), swift-object (<< 1.12.0-0ubuntu2)
154Replaces: swift-object (<< 1.12.0-0ubuntu2), swift (<< 1.13.1~rc1-0ubuntu1~)154Replaces: swift (<< 1.13.1~rc1-0ubuntu1~), swift-object (<< 1.12.0-0ubuntu2)
155Description: distributed virtual object store - object expirer155Description: distributed virtual object store - object expirer
156 OpenStack Object Storage (code-named Swift) is open source software for156 OpenStack Object Storage (code-named Swift) is open source software for
157 creating redundant, scalable object storage using clusters of standardized157 creating redundant, scalable object storage using clusters of standardized

Subscribers

People subscribed via source and target branches