Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
diff --git a/planetstack/core/models/planetstack.py b/planetstack/core/models/planetstackspecific.py
similarity index 100%
rename from planetstack/core/models/planetstack.py
rename to planetstack/core/models/planetstackspecific.py
diff --git a/planetstack/core/models/site.py b/planetstack/core/models/site.py
index 04d1073..d3aef81 100644
--- a/planetstack/core/models/site.py
+++ b/planetstack/core/models/site.py
@@ -5,6 +5,9 @@
from django.contrib.contenttypes import generic
from geoposition.fields import GeopositionField
from core.acl import AccessControlList
+from planetstack.config import Config
+
+config = Config()
class DeploymentLinkDeletionManager(PlCoreBaseDeletionManager):
def get_queryset(self):
diff --git a/planetstack/ec2_observer/__init__.pyc b/planetstack/ec2_observer/__init__.pyc
deleted file mode 100644
index 0be477a..0000000
--- a/planetstack/ec2_observer/__init__.pyc
+++ /dev/null
Binary files differ
diff --git a/planetstack/ec2_observer/event_manager.pyc b/planetstack/ec2_observer/event_manager.pyc
deleted file mode 100644
index a916928..0000000
--- a/planetstack/ec2_observer/event_manager.pyc
+++ /dev/null
Binary files differ