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
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-07-03 13:02:20 +0000
3+++ debian/changelog 2014-07-07 14:30:27 +0000
4@@ -1,11 +1,15 @@
5-swift (1.13.1-0ubuntu2) UNRELEASED; urgency=medium
6+swift (1.13.1-0ubuntu3) UNRELEASED; urgency=medium
7
8+ [ Chuck Short ]
9 * debian/control: Open up juno release
10 * debian/patches/ring-perms.patch: Dropped no longer needed.
11 * debian/switf-container.install: Add swift-reconciler-enqueue
12 and swift-container-reconciler.
13
14- -- Chuck Short <zulcss@ubuntu.com> Tue, 22 Apr 2014 11:28:13 -0400
15+ [ Liam Young ]
16+ * debian/control: Merged in deps from requirements.txt
17+
18+ -- Liam Young <liam.young@canonical.com> Mon, 07 Jul 2014 15:19:36 +0100
19
20 swift (1.13.1-0ubuntu1) trusty; urgency=medium
21
22
23=== modified file 'debian/control'
24--- debian/control 2014-04-22 15:28:14 +0000
25+++ debian/control 2014-07-07 14:30:27 +0000
26@@ -13,19 +13,19 @@
27 debhelper (>= 7.0.50~),
28 python-all-dev (>= 2.6.6-3~),
29 python-dnspython (>= 1.10.0),
30- python-eventlet (>= 0.9.8),
31+ python-eventlet (>= 0.9.15),
32 python-greenlet (>= 0.3.1),
33 python-mock,
34- python-netifaces,
35+ python-netifaces (>> 0.10.1),
36 python-nose,
37 python-openssl,
38 python-paste,
39- python-pastedeploy,
40+ python-pastedeploy (>= 1.3.3),
41 python-setuptools,
42- python-simplejson,
43+ python-simplejson (>= 2.0.9),
44 python-sphinx (>= 1.0),
45 python-swiftclient,
46- python-xattr
47+ python-xattr (>= 0.4)
48 Standards-Version: 3.9.4
49 Homepage: http://launchpad.net/swift
50 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/swift/juno/files
51@@ -150,8 +150,8 @@
52 ${python:Depends},
53 ${shlibs:Depends}
54 Provides: ${python:Provides}
55-Breaks: swift-object (<< 1.12.0-0ubuntu2), swift (<< 1.13.1~rc1-0ubuntu1~)
56-Replaces: swift-object (<< 1.12.0-0ubuntu2), swift (<< 1.13.1~rc1-0ubuntu1~)
57+Breaks: swift (<< 1.13.1~rc1-0ubuntu1~), swift-object (<< 1.12.0-0ubuntu2)
58+Replaces: swift (<< 1.13.1~rc1-0ubuntu1~), swift-object (<< 1.12.0-0ubuntu2)
59 Description: distributed virtual object store - object expirer
60 OpenStack Object Storage (code-named Swift) is open source software for
61 creating redundant, scalable object storage using clusters of standardized

Subscribers

People subscribed via source and target branches