← Back to branch summary

~0x44/nova/bug838466

« back to all changes in this revision

Viewing changes to bin/nova-network

  • Committer: Cerberus
  • Date: 2011-02-28 17:39:23 UTC
  • mfrom: (749 nova)
  • mto: This revision was merged to the branch mainline in revision 762.
  • Revision ID: matt.dietz@rackspace.com-20110228173923-1e3upi2ddoc2j4xl
Merge from trunk and merge conflict resolution

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/nova-network
36
36
 
37
37
gettext.install('nova', unicode=1)
38
38
 
 
39
from nova import flags
 
40
from nova import log as logging
39
41
from nova import service
40
42
from nova import utils
41
43
 
42
44
if __name__ == '__main__':
43
45
    utils.default_flagfile()
 
46
    flags.FLAGS(sys.argv)
 
47
    logging.setup()
44
48
    service.serve()
45
49
    service.wait()