OpenStack Object Storage (swift)

Merge lp:~james-page/swift/fixup-upgrades into lp:~ubuntu-server-dev/swift/icehouse

  1. fixup-upgrades
  2. Merge into icehouse
Proposed by James Page
Status: Merged
Approved by: Chuck Short
Approved revision: 177
Merged at revision: 177
Proposed branch: lp:~james-page/swift/fixup-upgrades
Merge into: lp:~ubuntu-server-dev/swift/icehouse
Diff against target: 78 lines (+18/-3)
2 files modified
debian/changelog (+6/-1)
debian/control (+12/-2)
To merge this branch: bzr merge lp:~james-page/swift/fixup-upgrades
Reviewer Review Type Date Requested Status
Ubuntu Server Developers Pending
Review via email: mp+215423@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2014-04-10 13:16:50 +0000
+++ debian/changelog 2014-04-11 13:47:53 +0000
@@ -1,8 +1,13 @@
1swift (1.13.1~rc1-0ubuntu3) UNRELEASED; urgency=medium1swift (1.13.1~rc1-0ubuntu3) UNRELEASED; urgency=medium
22
3 [ Chuck Short ]
3 * debian/patches/ring-perms.patch: Dropped no longer needed.4 * debian/patches/ring-perms.patch: Dropped no longer needed.
45
5 -- Chuck Short <zulcss@ubuntu.com> Thu, 10 Apr 2014 09:16:24 -04006 [ James Page ]
7 * d/control: Add appropriate Breaks/Replaces to support move of man pages
8 between binary packages in 1.13.1~rc1-0ubuntu1 (LP: #1306241).
9
10 -- James Page <james.page@ubuntu.com> Fri, 11 Apr 2014 14:43:33 +0100
611
7swift (1.13.1~rc1-0ubuntu2) trusty; urgency=medium12swift (1.13.1~rc1-0ubuntu2) trusty; urgency=medium
813
914
=== modified file 'debian/control'
--- debian/control 2014-04-04 09:58:02 +0000
+++ debian/control 2014-04-11 13:47:53 +0000
@@ -50,6 +50,8 @@
50 ${misc:Depends},50 ${misc:Depends},
51 ${python:Depends}51 ${python:Depends}
52Provides: ${python:Provides}52Provides: ${python:Provides}
53Breaks: swift (<< 1.13.1~rc1-0ubuntu1~)
54Replaces: swift (<< 1.13.1~rc1-0ubuntu1~)
53Description: distributed virtual object store - Python libraries55Description: distributed virtual object store - Python libraries
54 OpenStack Object Storage (code-named Swift) is open source software for56 OpenStack Object Storage (code-named Swift) is open source software for
55 creating redundant, scalable object storage using clusters of standardized57 creating redundant, scalable object storage using clusters of standardized
@@ -115,6 +117,8 @@
115 ${python:Depends},117 ${python:Depends},
116 ${shlibs:Depends}118 ${shlibs:Depends}
117Provides: ${python:Provides}119Provides: ${python:Provides}
120Breaks: swift (<< 1.13.1~rc1-0ubuntu1~)
121Replaces: swift (<< 1.13.1~rc1-0ubuntu1~)
118Description: distributed virtual object store - proxy server122Description: distributed virtual object store - proxy server
119 OpenStack Object Storage (code-named Swift) is open source software for123 OpenStack Object Storage (code-named Swift) is open source software for
120 creating redundant, scalable object storage using clusters of standardized124 creating redundant, scalable object storage using clusters of standardized
@@ -146,8 +150,8 @@
146 ${python:Depends},150 ${python:Depends},
147 ${shlibs:Depends}151 ${shlibs:Depends}
148Provides: ${python:Provides}152Provides: ${python:Provides}
149Breaks: swift-object (<< 1.12.0-0ubuntu2)153Breaks: swift-object (<< 1.12.0-0ubuntu2), (<< 1.13.1~rc1-0ubuntu1~)
150Replaces: swift-object (<< 1.12.0-0ubuntu2)154Replaces: swift-object (<< 1.12.0-0ubuntu2), (<< 1.13.1~rc1-0ubuntu1~)
151Description: distributed virtual object store - object expirer155Description: distributed virtual object store - object expirer
152 OpenStack Object Storage (code-named Swift) is open source software for156 OpenStack Object Storage (code-named Swift) is open source software for
153 creating redundant, scalable object storage using clusters of standardized157 creating redundant, scalable object storage using clusters of standardized
@@ -180,6 +184,8 @@
180 ${python:Depends},184 ${python:Depends},
181 ${shlibs:Depends}185 ${shlibs:Depends}
182Provides: ${python:Provides}186Provides: ${python:Provides}
187Breaks: swift (<< 1.13.1~rc1-0ubuntu1~)
188Replaces: swift (<< 1.13.1~rc1-0ubuntu1~)
183Description: distributed virtual object store - object server189Description: distributed virtual object store - object server
184 OpenStack Object Storage (code-named Swift) is open source software for190 OpenStack Object Storage (code-named Swift) is open source software for
185 creating redundant, scalable object storage using clusters of standardized191 creating redundant, scalable object storage using clusters of standardized
@@ -211,6 +217,8 @@
211 ${python:Depends},217 ${python:Depends},
212 ${shlibs:Depends}218 ${shlibs:Depends}
213Provides: ${python:Provides}219Provides: ${python:Provides}
220Breaks: swift (<< 1.13.1~rc1-0ubuntu1~)
221Replaces: swift (<< 1.13.1~rc1-0ubuntu1~)
214Description: distributed virtual object store - container server222Description: distributed virtual object store - container server
215 OpenStack Object Storage (code-named Swift) is open source software for223 OpenStack Object Storage (code-named Swift) is open source software for
216 creating redundant, scalable object storage using clusters of standardized224 creating redundant, scalable object storage using clusters of standardized
@@ -242,6 +250,8 @@
242 ${python:Depends},250 ${python:Depends},
243 ${shlibs:Depends}251 ${shlibs:Depends}
244Provides: ${python:Provides}252Provides: ${python:Provides}
253Breaks: swift (<< 1.13.1~rc1-0ubuntu1~)
254Replaces: swift (<< 1.13.1~rc1-0ubuntu1~)
245Description: distributed virtual object store - account server255Description: distributed virtual object store - account server
246 OpenStack Object Storage (code-named Swift) is open source software for256 OpenStack Object Storage (code-named Swift) is open source software for
247 creating redundant, scalable object storage using clusters of standardized257 creating redundant, scalable object storage using clusters of standardized

Subscribers

People subscribed via source and target branches