commit 69782931a008b0e38f9ce668315d49855179ca6d
author Zack Williams <zdw@artisancomputer.com> Fri Jun 03 13:27:50 2016 -0700
committer Zack Williams <zdw@artisancomputer.com> Fri Jun 03 13:27:50 2016 -0700
tree cbab2e78505f2041ba6bebace8777cdb538932ee
parent 38a1eecaf4b747a82739db99189f5718abc69d5a
parent e2168b205c3d71bc0e1e75dcf153e562d9d67348

Merge branch 'master' of github.com:open-cloud/xos

xos/core/models/service.py

diff --git a/xos/core/models/service.py b/xos/core/models/service.py
index b341e83..5196336 100644
--- a/xos/core/models/service.py
+++ b/xos/core/models/service.py
@@ -548,7 +548,7 @@
         if self.slice.default_image:
             return self.slice.default_image
 
-        raise XOPSProgrammingError("Please set a default image for %s" % self.slice.name)
+        raise XOSProgrammingError("Please set a default image for %s" % self.slice.name)
 
     def make_new_instance(self):
         from core.models import Instance, Flavor
@@ -683,7 +683,7 @@
         if slice.default_image:
             return slice.default_image
 
-        raise XOPSProgrammingError("Please set a default image for %s" % self.slice.name)
+        raise XOSProgrammingError("Please set a default image for %s" % self.slice.name)
 
     def save_instance(self, instance):
         # Override this function to do custom pre-save or post-save processing,