diff options
| author | Ed Leafe <ed@leafe.com> | 2011-01-21 16:10:26 -0500 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2011-01-21 16:10:26 -0500 |
| commit | 09188c61d5359750f9deadcf912f0fa5fbf005b7 (patch) | |
| tree | 53006dc213fc28f8c74179516f109c93603f429a /nova/service.py | |
| parent | 75f93d83be59a85b63a267dc22458a133c591f8e (diff) | |
| parent | ec60562b1a6d18e6df4024870468c0501dc692f9 (diff) | |
| download | nova-09188c61d5359750f9deadcf912f0fa5fbf005b7.tar.gz nova-09188c61d5359750f9deadcf912f0fa5fbf005b7.tar.xz nova-09188c61d5359750f9deadcf912f0fa5fbf005b7.zip | |
Resolved trunk merge conflicts
Diffstat (limited to 'nova/service.py')
| -rw-r--r-- | nova/service.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/nova/service.py b/nova/service.py index 705bed7fc..2c30997f2 100644 --- a/nova/service.py +++ b/nova/service.py @@ -38,6 +38,7 @@ from nova import log as logging from nova import flags from nova import rpc from nova import utils +from nova import version FLAGS = flags.FLAGS @@ -156,7 +157,8 @@ class Service(object): report_interval = FLAGS.report_interval if not periodic_interval: periodic_interval = FLAGS.periodic_interval - logging.audit(_("Starting %s node"), topic) + logging.audit(_("Starting %s node (version %s)"), topic, + version.version_string_with_vcs()) service_obj = cls(host, binary, topic, manager, report_interval, periodic_interval) |