commit 62f997df96e545ad313a998e5b819b18855d8914
author Scott Baker <smbaker@gmail.com> Mon Sep 22 14:46:16 2014 -0700
committer Scott Baker <smbaker@gmail.com> Mon Sep 22 14:46:16 2014 -0700
tree 5b5c806f7f449d2cf6c2075ac892007b23e45294
parent 06766755a99aae72768c4c63ee1a5078232ec912
parent f6394731d935e8c35e42b6384254329341c73c87

Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi

planetstack/core/models/__init__.py

diff --git a/planetstack/core/models/__init__.py b/planetstack/core/models/__init__.py
index 169817f..b4e863f 100644
--- a/planetstack/core/models/__init__.py
+++ b/planetstack/core/models/__init__.py
@@ -1,5 +1,4 @@
 from .plcorebase import PlCoreBase
-from .planetstack import PlanetStack
 from .project import Project
 from .singletonmodel import SingletonModel
 from .service import Service
@@ -21,8 +20,7 @@
 from .credential import UserCredential,SiteCredential,SliceCredential
 from .site import SiteRole
 from .site import SitePrivilege
-from .planetstack import PlanetStackRole
-from .planetstack import PlanetStackPrivilege
+from .planetstackspecific import PlanetStack,PlanetStackRole,PlanetStackPrivilege
 from .slicetag import SliceTag
 from .flavor import Flavor
 from .sliver import Sliver