Merge lp:~hopem/charms/precise/swift-proxy/trunk into lp:~charmers/charms/precise/swift-proxy/trunk

Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 40
Proposed branch: lp:~hopem/charms/precise/swift-proxy/trunk
Merge into: lp:~charmers/charms/precise/swift-proxy/trunk
Diff against target: 19 lines (+2/-2)
2 files modified
hooks/lib/openstack_common.py (+1/-1)
revision (+1/-1)
To merge this branch: bzr merge lp:~hopem/charms/precise/swift-proxy/trunk
Reviewer Review Type Date Requested Status
Juan L. Negron (community) Approve
Review via email: mp+161088@code.launchpad.net

Description of the change

set Grizzly Swift version to 1.8.0 since this is version currently in cloud archive.

To post a comment you must log in.
Revision history for this message
Juan L. Negron (negronjl) wrote :

Reviewing now.

-Juan

Revision history for this message
Juan L. Negron (negronjl) wrote :

Approved.

Will merge in a minute.

-Juan

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/lib/openstack_common.py'
2--- hooks/lib/openstack_common.py 2013-02-13 19:34:42 +0000
3+++ hooks/lib/openstack_common.py 2013-04-26 10:38:25 +0000
4@@ -27,7 +27,7 @@
5 '1.4.3': 'diablo',
6 '1.4.8': 'essex',
7 '1.7.4': 'folsom',
8- '1.7.6': 'grizzly'
9+ '1.8.0': 'grizzly'
10 }
11
12 def juju_log(msg):
13
14=== modified file 'revision'
15--- revision 2013-04-10 20:33:37 +0000
16+++ revision 2013-04-26 10:38:25 +0000
17@@ -1,1 +1,1 @@
18-111
19+112

Subscribers

People subscribed via source and target branches