Merge branch 'devel-2.1'

[ganeti-local] / lib / errors.py

diff --git a/lib/errors.py b/lib/errors.py
index d119591..a50b037 100644 (file)
--- a/lib/errors.py
+++ b/lib/errors.py
@@ -110,6 +110,12 @@ class ConfigurationError(GenericError):
   pass
 
 
+class ReservationError(GenericError):
+  """Errors reserving a resource.
+
+  """
+
+
 class RemoteError(GenericError):
   """Programming-related error on remote call.
 
@@ -378,7 +384,7 @@ def EncodeException(err):
 
 
 def MaybeRaise(result):
-  """Is this looks like an encoded Ganeti exception, raise it.
+  """If this looks like an encoded Ganeti exception, raise it.
 
   This function tries to parse the passed argument and if it looks
   like an encoding done by EncodeException, it will re-raise it.