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

Conflicts:
	planetstack/observer/syncstep.py

diff --cc planetstack/core/fixtures/demo_data.json
index 0bc3fdc,f982668..3f1d3f5
--- 1/planetstack/core/fixtures/demo_data.json
--- 2/planetstack/core/fixtures/demo_data.json
+++ b/planetstack/core/fixtures/demo_data.json
@@@ -1132,60 -1040,9 +1054,10 @@@
          "is_admin": true, 
          "password": "!", 
          "email": "jhh@cs.arizona.edu", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
- {
-     "pk": 16, 
-     "model": "core.user", 
-     "fields": {
-         "username": "ayaka@onlab.us", 
-         "public_key": "", 
-         "updated": "2014-03-27T21:20:58.151Z", 
-         "is_readonly": false, 
-         "firstname": "Ayaka", 
-         "user_url": null, 
-         "lastname": "Koshibe", 
-         "created": "2014-03-27T21:20:58.151Z", 
-         "is_active": true, 
-         "site": null, 
-         "phone": "", 
-         "kuser_id": null, 
-         "is_staff": true, 
-         "last_login": "2014-03-27T21:20:57.960Z", 
-         "timezone": "America/New_York", 
-         "is_admin": true, 
-         "password": "pbkdf2_sha256$10000$QhTyK7jMRCya$JCPA1SbY+aNjoa2MVqu9/rOHxdKdoQSna3EuJ10x9ac=", 
-         "email": "ayaka@onlab.us", 
-         "enacted": null
-     }
- },
- {
-     "pk": 17, 
-     "model": "core.user", 
-     "fields": {
-         "username": "amisha@onlab.us", 
-         "public_key": "", 
-         "updated": "2014-03-27T21:56:42.868Z", 
-         "is_readonly": false, 
-         "firstname": "Amisha", 
-         "user_url": null, 
-         "lastname": "Bahl", 
-         "created": "2014-03-27T21:56:24.661Z", 
-         "is_active": true, 
-         "site": 22, 
-         "phone": "", 
-         "kuser_id": null, 
-         "is_staff": true, 
-         "last_login": "2014-04-15T21:26:38.878Z", 
-         "timezone": "America/New_York", 
-         "is_admin": true, 
-         "password": "pbkdf2_sha256$10000$QL6aOPpPyvB1$qBO7ymfOSPQdM8/zoVjzAnbU0ui1uoGzdJvqK7F/F5c=", 
-         "email": "amisha@onlab.us", 
-         "enacted": null
-     }
- },
  {
      "pk": 1, 
      "model": "core.serviceclass", 

diff --cc planetstack/core/fixtures/initial_data.json
Simple merge

diff --cc planetstack/observer/event_loop.py
index d659ab5,57f432e..ec49dd7
--- 1/planetstack/observer/event_loop.py
--- 2/planetstack/observer/event_loop.py
+++ b/planetstack/observer/event_loop.py
@@@ -16,10 -16,9 +16,10 @@@ from openstack.driver import OpenStackD
  from util.logger import Logger, logging, logger
  #from timeout import timeout
  from planetstack.config import Config
- from observer.steps import *
+ #from observer.steps import *
  from syncstep import SyncStep
  from toposort import toposort
 +from observer.error_mapper import error_mapper
  
  debug_mode = False
  

diff --cc planetstack/observer/syncstep.py
Simple merge