OpenStack Object Storage (swift)

Merge lp:~zulcss/swift/saucy-fix into lp:~openstack-ubuntu-testing/swift/havana

  1. saucy-fix
  2. Merge into havana
Proposed by Chuck Short
Status: Merged
Merged at revision: 143
Proposed branch: lp:~zulcss/swift/saucy-fix
Merge into: lp:~openstack-ubuntu-testing/swift/havana
Diff against target: 38 lines (+10/-1)
3 files modified
debian/changelog (+8/-0)
debian/control (+1/-1)
debian/swift.install (+1/-0)
To merge this branch: bzr merge lp:~zulcss/swift/saucy-fix
Reviewer Review Type Date Requested Status
James Page Approve
Review via email: mp+162352@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-04-04 15:38:20 +0000
3+++ debian/changelog 2013-05-03 13:34:56 +0000
4@@ -1,3 +1,11 @@
5+swift (1.8.1-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * New upstream release.
8+ * debian/swift.install: Add swift-config.
9+ * debian/control: Nump standards version to 3.9.4
10+
11+ -- Chuck Short <zulcss@ubuntu.com> Fri, 03 May 2013 08:03:53 -0500
12+
13 swift (1.8.0-0ubuntu1) raring; urgency=low
14
15 * New upstream release.
16
17=== modified file 'debian/control'
18--- debian/control 2012-11-08 14:45:17 +0000
19+++ debian/control 2013-05-03 13:34:56 +0000
20@@ -23,7 +23,7 @@
21 python-pastedeploy,
22 python-sphinx (>= 1.0),
23 python-swiftclient
24-Standards-Version: 3.9.3
25+Standards-Version: 3.9.4
26 Homepage: http://launchpad.net/swift
27 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/swift/essex
28 Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-server-dev/swift/essex
29
30=== modified file 'debian/swift.install'
31--- debian/swift.install 2012-11-08 14:45:17 +0000
32+++ debian/swift.install 2013-05-03 13:34:56 +0000
33@@ -1,4 +1,5 @@
34 usr/bin/swift-bench
35+usr/bin/swift-config
36 usr/bin/swift-ring-builder
37 usr/bin/swift-get-nodes
38 usr/bin/swift-dispersion-populate

Subscribers

People subscribed via source and target branches