summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-15 09:03:41 +0000
committerGerrit Code Review <review@openstack.org>2012-02-15 09:03:41 +0000
commit99c2e02b44a1012c8e26fc7658dc40ec4620a1ee (patch)
treef89cb4cbdd88f4975e218cd0867d318d1da007ec
parentcc12819adef88983ef78e9bfb18745df9c39b561 (diff)
parent649e32b0dcd8610e4bb248ba508179083a0eb6bd (diff)
downloadnova-99c2e02b44a1012c8e26fc7658dc40ec4620a1ee.tar.gz
nova-99c2e02b44a1012c8e26fc7658dc40ec4620a1ee.tar.xz
nova-99c2e02b44a1012c8e26fc7658dc40ec4620a1ee.zip
Merge "Changing nova-manage error message"
-rw-r--r--.mailmap1
-rw-r--r--Authors2
-rwxr-xr-xbin/nova-manage2
3 files changed, 3 insertions, 2 deletions
diff --git a/.mailmap b/.mailmap
index 8270e0c5c..853a942e3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -18,6 +18,7 @@
<corywright@gmail.com> <cory.wright@rackspace.com>
<dan@nicira.com> <danwent@dan-xs3-cs>
<dan@nicira.com> <danwent@gmail.com>
+<derekh@redhat.com> <higginsd@gmail.com>
<devin.carlen@gmail.com> <devcamcar@illian.local>
<edouard1.thuleau@orange.com> <thuleau@gmail.com>
<ewan.mellor@citrix.com> <emellor@silver>
diff --git a/Authors b/Authors
index 3f4245979..9995e58ac 100644
--- a/Authors
+++ b/Authors
@@ -42,7 +42,7 @@ David Pravec <David.Pravec@danix.org>
David Subiros <david.perez5@hp.com>
Dean Troyer <dtroyer@gmail.com>
Deepak Garg <deepak.garg@citrix.com>
-Derek Higgins <higginsd@gmail.com>
+Derek Higgins <derekh@redhat.com>
Devdeep Singh <devdeep.singh@citrix.com>
Devendra Modium <dmodium@isi.edu>
Devin Carlen <devin.carlen@gmail.com>
diff --git a/bin/nova-manage b/bin/nova-manage
index a271cf2ff..49ec41656 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -616,7 +616,7 @@ class ProjectCommands(object):
print e
print _("The above error may show that the certificate db has "
"not been created.\nPlease create a database by running "
- "a nova-api server on this host.")
+ "a nova-cert server on this host.")
AccountCommands = ProjectCommands