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

Conflicts:
	planetstack/core/models/user.py

diff --combined planetstack/core/models/user.py
index a74ba78,fba2a7e..3c4d377
--- 1/planetstack/core/models/user.py
--- 2/planetstack/core/models/user.py
+++ b/planetstack/core/models/user.py
@@@ -4,7 -4,6 +4,7 @@@ from collections import defaultdic
  from django.db import models
  from django.db.models import F, Q
  from core.models import PlCoreBase,Site, DashboardView
 +from core.models.site import Deployment
  from django.contrib.auth.models import AbstractBaseUser, BaseUserManager
  from timezones.fields import TimeZoneField
  from operator import itemgetter, attrgetter
@@@ -164,24 -163,6 +164,6 @@@ class User(AbstractBaseUser)
              qs = User.objects.filter(Q(site__in=sites) | Q(id__in=user_ids))
          return qs            
  
-              
-     
- class UserDeployments(PlCoreBase):
-     user = models.ForeignKey(User)
-     deployment = models.ForeignKey(Deployment)
-     kuser_id = models.CharField(null=True, blank=True, max_length=200, help_text="Keystone user id")
- 
-     def __unicode__(self):  return u'%s %s' % (self.user, self.deployment.name)
- 
-     @staticmethod
-     def select_by_user(user):
-         if user.is_admin:
-             qs = UserDeployments.objects.all()
-         else:
-             users = Users.select_by_user(user)
-             qs = Usereployments.objects.filter(user__in=slices)
-         return qs
- 
  class UserDashboardView(PlCoreBase):
       user = models.ForeignKey(User, related_name="dashboardViews")
       dashboardView = models.ForeignKey(DashboardView, related_name="dashboardViews")