Merge lp:~ewanmellor/glance/lp694382 into lp:~hudson-openstack/glance/trunk

Proposed by Ewan Mellor
Status: Merged
Approved by: Jay Pipes
Approved revision: 30
Merged at revision: 30
Proposed branch: lp:~ewanmellor/glance/lp694382
Merge into: lp:~hudson-openstack/glance/trunk
Diff against target: 11 lines (+2/-2)
1 file modified
setup.py (+2/-2)
To merge this branch: bzr merge lp:~ewanmellor/glance/lp694382
Reviewer Review Type Date Requested Status
Jay Pipes (community) Approve
Review via email: mp+44697@code.launchpad.net

Commit message

Description of the change

To post a comment you must log in.
Revision history for this message
Devin Carlen (devcamcar) wrote :

lgtm

Revision history for this message
Jay Pipes (jaypipes) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'setup.py'
2--- setup.py 2010-10-21 19:51:44 +0000
3+++ setup.py 2010-12-26 00:46:11 +0000
4@@ -57,5 +57,5 @@
5 'Environment :: No Input/Output (Daemon)',
6 ],
7 install_requires=[], # removed for better compat
8- scripts=['bin/parallax-server',
9- 'bin/teller-server'])
10+ scripts=['bin/glance-api',
11+ 'bin/glance-registry'])

Subscribers

People subscribed via source and target branches