Glance

Merge lp:~abrindeyev/glance/lp739327 into lp:~glance-coresec/glance/cactus-trunk

  1. lp739327
  2. Merge into cactus-trunk
Proposed by Andrey Brindeyev
Status: Merged
Approved by: Jay Pipes
Approved revision: 93
Merged at revision: 93
Proposed branch: lp:~abrindeyev/glance/lp739327
Merge into: lp:~glance-coresec/glance/cactus-trunk
Diff against target: 28 lines (+2/-3)
2 files modified
README (+2/-2)
setup.py (+0/-1)
To merge this branch: bzr merge lp:~abrindeyev/glance/lp739327
Reviewer Review Type Date Requested Status
Jay Pipes (community) Approve
Review via email: mp+54212@code.launchpad.net

Description of the change

Removed glance-combined. Fixed README

To post a comment you must log in.
Revision history for this message
Jay Pipes (jaypipes) wrote :

rock on.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2011-02-06 01:36:05 +0000
3+++ README 2011-03-21 14:06:33 +0000
4@@ -29,10 +29,10 @@
5
6
7 Now that Glance is installed, you can start the service. The easiest way to
8-do that is by using the `glance-combined` utility which runs both the
9+do that is by using the `glance-control` utility which runs both the
10 `glance-api` and `glance-registry` services::
11
12- glance-combined
13+ glance-control all start
14
15
16 Once both services are running, you can now use the `glance-upload` tool to
17
18=== modified file 'setup.py'
19--- setup.py 2011-03-01 06:38:34 +0000
20+++ setup.py 2011-03-21 14:06:33 +0000
21@@ -87,7 +87,6 @@
22 ],
23 scripts=['bin/glance',
24 'bin/glance-api',
25- 'bin/glance-combined',
26 'bin/glance-control',
27 'bin/glance-manage',
28 'bin/glance-registry',

Subscribers

People subscribed via source and target branches