commit 44809fc737e4ff0708de83b134d8c30a25125dc9
author Scott Baker <smbaker@gmail.com> Wed Feb 18 11:29:10 2015 -0800
committer Scott Baker <smbaker@gmail.com> Wed Feb 18 11:29:10 2015 -0800
tree 595fde0995dcd23ee597fd935e58f6e09358a108
parent 9ecc839021962df14bcfaf039318963f5fb78e62
parent 8b9975e22ec2f2c90247ae025eccfdb9843b37e7

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

planetstack/dmdot

diff --git a/planetstack/dmdot b/planetstack/dmdot
index 4bcf7e1..d1b11c1 100644
--- a/planetstack/dmdot
+++ b/planetstack/dmdot
@@ -7,7 +7,7 @@
 
 sys.path.append('.')
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "xos.settings")
 
 from django.db.models.fields.related import ForeignKey
 

planetstack/ec2_observer/dmdot

diff --git a/planetstack/ec2_observer/dmdot b/planetstack/ec2_observer/dmdot
index 2d95e9d..de07a78 100644
--- a/planetstack/ec2_observer/dmdot
+++ b/planetstack/ec2_observer/dmdot
@@ -7,7 +7,7 @@
 
 sys.path.append('.')
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "planetstack.settings")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "xos.settings")
 
 from django.db.models.fields.related import ForeignKey
 from core.models import *