← Back to branch summary

~jaypipes/glance/use-paste-deploy

« back to all changes in this revision

Viewing changes to bin/glance-combined

  • Committer: jaypipes at gmail
  • Date: 2011-02-01 21:30:07 UTC
  • mfrom: (59.1.2 lp711385)
  • Revision ID: jaypipes@gmail.com-20110201213007-zgvmmgn9x7ragh1v
Merge fix from Rick for Bug #711385

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/glance-combined
35
35
from glance import version
36
36
from glance.common import config
37
37
from glance.common import server
 
38
import glance.registry.db
38
39
import glance.store
39
40
 
40
41
 
98
99
                      "virtual machine images to. Choices: ('%s') "
99
100
                      "Default: %%default" % "','".join(DEFAULT_STORE_CHOICES))
100
101
    glance.store.add_options(parser)
 
102
    glance.registry.db.add_options(parser)
101
103
 
102
104
 
103
105
def main(_args):