From: Sapan Bhatia <gwsapan@gmail.com>
Date: Mon, 12 May 2014 18:33:56 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi into observer3.0
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ee890b694a34107d61b75ca1e2e37f984d5d419a;p=plstackapi.git

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

Conflicts:
	planetstack/core/fixtures/demo_data.json
	planetstack/core/fixtures/initial_data.json
---

ee890b694a34107d61b75ca1e2e37f984d5d419a
diff --cc planetstack/core/fixtures/demo_data.json
index 362105f,c73d958..0bc3fdc
--- a/planetstack/core/fixtures/demo_data.json
+++ b/planetstack/core/fixtures/demo_data.json
@@@ -647,13 -913,12 +919,13 @@@
          "phone": "", 
          "kuser_id": null, 
          "is_staff": true, 
-         "last_login": "2013-12-17T17:29:10.464Z", 
+         "last_login": "2014-03-23T23:19:35.597Z", 
          "timezone": "America/New_York", 
          "is_admin": true, 
-         "password": "pbkdf2_sha256$10000$dLKRXWJlkuvm$Ycamy79oT1lN0Q5R3B3nvlr70n2X50mL86yraDwzuWk=", 
+         "password": "pbkdf2_sha256$10000$EOrqG6KzVO8z$4jSJMN/35PKPmJkDEHjAY1c/mDpBfoW1U8XAfk1eDLk=", 
          "email": "llp@onlab.us", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -860,10 -1118,59 +1132,60 @@@
          "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
index 41a5cb2,5e50a7b..8a5c027
--- a/planetstack/core/fixtures/initial_data.json
+++ b/planetstack/core/fixtures/initial_data.json
@@@ -74,12 -69,8 +73,9 @@@
          "location": "37.4294,-122.17200000000003", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [
-             5
-         ], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -97,12 -87,8 +92,9 @@@
          "location": "47.6531,-122.31299999999999", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [
-             6
-         ], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -120,12 -105,8 +111,9 @@@
          "location": "40.3502,-74.6524", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [
-             7
-         ], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -143,12 -123,8 +130,9 @@@
          "location": "33.7772,-84.39760000000001", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [
-             8
-         ], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -166,12 -141,8 +149,9 @@@
          "location": "49.14,6.588999999999942", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [
-             9
-         ], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -189,12 -159,8 +168,9 @@@
          "location": "33.0075,-84.0038", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [
-             10
-         ], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -212,12 -177,8 +187,9 @@@
          "location": "41.0085,-87.0065", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [
-             10
-         ], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -235,12 -195,8 +206,9 @@@
          "location": "29.0077,-95.0037", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [
-             10
-         ], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -258,12 -213,8 +225,9 @@@
          "location": "39.0012,-94.0063", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [
-             10
-         ], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -281,12 -231,8 +244,9 @@@
          "location": "33.2505,-117.503", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [
-             10
-         ], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -304,12 -249,8 +263,9 @@@
          "location": "40.72,-73.99", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [
-             10
-         ], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -327,12 -267,8 +282,9 @@@
          "location": "40.7659,-111.844", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [
-             10
-         ], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -350,12 -285,8 +301,9 @@@
          "location": "47.6531,-122.313", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [
-             10
-         ], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -373,12 -303,8 +320,9 @@@
          "location": "38.009,-77.0003", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [
-             10
-         ], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -396,17 -321,8 +339,9 @@@
          "location": "37.452955,-122.18176599999998", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [
-             5, 
-             6, 
-             7, 
-             8, 
-             9, 
-             10
-         ], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -424,12 -339,8 +358,9 @@@
          "location": "1.33544,103.88999999999999", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [
-             10
-         ], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -447,10 -357,8 +377,9 @@@
          "location": "32.2333,-110.94799999999998", 
          "latitude": null, 
          "is_public": true, 
-         "deployments": [], 
          "abbreviated_name": "", 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -1029,11 -1143,9 +1192,10 @@@
          "enabled": true, 
          "site": 22, 
          "omf_friendly": false, 
-         "subnet_id": null, 
          "slice_url": "", 
          "creator": 1, 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -1052,11 -1161,9 +1211,10 @@@
          "enabled": true, 
          "site": 22, 
          "omf_friendly": false, 
-         "subnet_id": null, 
          "slice_url": "", 
          "creator": 1, 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -1075,11 -1179,9 +1230,10 @@@
          "enabled": true, 
          "site": 22, 
          "omf_friendly": false, 
-         "subnet_id": null, 
          "slice_url": "", 
          "creator": 8, 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -1098,11 -1197,9 +1249,10 @@@
          "enabled": true, 
          "site": 22, 
          "omf_friendly": false, 
-         "subnet_id": null, 
          "slice_url": "", 
          "creator": 8, 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -1121,11 -1215,9 +1268,10 @@@
          "enabled": true, 
          "site": 22, 
          "omf_friendly": false, 
-         "subnet_id": null, 
          "slice_url": "", 
          "creator": null, 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -1144,11 -1233,9 +1287,10 @@@
          "enabled": true, 
          "site": 24, 
          "omf_friendly": false, 
-         "subnet_id": null, 
          "slice_url": "", 
          "creator": null, 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -1167,11 -1251,9 +1306,10 @@@
          "enabled": true, 
          "site": 24, 
          "omf_friendly": false, 
-         "subnet_id": null, 
          "slice_url": "", 
          "creator": null, 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -1190,11 -1269,9 +1325,10 @@@
          "enabled": true, 
          "site": 22, 
          "omf_friendly": false, 
-         "subnet_id": null, 
          "slice_url": "", 
          "creator": null, 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -1213,11 -1287,9 +1344,10 @@@
          "enabled": true, 
          "site": 10, 
          "omf_friendly": false, 
-         "subnet_id": null, 
          "slice_url": "", 
          "creator": null, 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -1236,11 -1305,9 +1363,10 @@@
          "enabled": true, 
          "site": 10, 
          "omf_friendly": false, 
-         "subnet_id": null, 
          "slice_url": "", 
          "creator": null, 
 -        "enacted": null
 +        "enacted": null,
 +        "backend_status":"ok"
      }
  },
  {
@@@ -3224,9 -3139,7 +3350,13 @@@
          "created": "2013-12-09T14:26:56.787Z", 
          "container_format": "bare", 
          "disk_format": "raw", 
++<<<<<<< HEAD
 +        "image_id": "d4bdbba2-6883-4232-863a-202fd4c56c21", 
 +        "enacted": null,
 +        "backend_status":"ok"
++=======
+         "enacted": null
++>>>>>>> 2290b059d8ddc69cc7d4dfa8418bbad65c896e61
      }
  },
  {