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

diff --combined planetstack/core/admin.py
index 114382f,663dd9a..a1a21d6
--- 1/planetstack/core/admin.py
--- 2/planetstack/core/admin.py
+++ b/planetstack/core/admin.py
@@@ -402,9 -402,9 +402,9 @@@ class TagAdmin(admin.ModelAdmin)
  class SliverAdmin(PlanetStackBaseAdmin):
      form = SliverForm
      fieldsets = [
 -        ('Sliver', {'fields': ['ip', 'instance_name', 'slice', 'numberCores', 'image', 'key', 'node', 'deploymentNetwork']})
 +        ('Sliver', {'fields': ['ip', 'instance_name', 'slice', 'numberCores', 'image', 'node', 'deploymentNetwork']})
      ]
 -    list_display = ['ip', 'instance_name', 'slice', 'numberCores', 'image', 'key', 'node', 'deploymentNetwork']
 +    list_display = ['ip', 'instance_name', 'slice', 'numberCores', 'image', 'node', 'deploymentNetwork']
      inlines = [TagInline]
  
      def formfield_for_foreignkey(self, db_field, request, **kwargs):
@@@ -549,14 -549,17 +549,17 @@@ class UserAdmin(UserAdmin)
          return super(UserAdmin, self).formfield_for_foreignkey(db_field, request, **kwargs)
  
  class ServiceResourceInline(admin.TabularInline):
+     exclude = ['enacted']
      model = ServiceResource
      extra = 0
  
  class ServiceClassAdmin(admin.ModelAdmin):
+     exclude = ['enacted']
      list_display = ('name', 'commitment', 'membershipFee')
      inlines = [ServiceResourceInline]
  
  class ReservedResourceInline(admin.TabularInline):
+     exclude = ['enacted']
      model = ReservedResource
      extra = 0
  
@@@ -625,6 -628,7 +628,7 @@@ class ReservationAddRefreshForm(Reserva
          return False
  
  class ReservationAdmin(admin.ModelAdmin):
+     exclude = ['enacted']
      list_display = ('startTime', 'duration')
      inlines = [ReservedResourceInline]
      form = ReservationAddForm
@@@ -702,6 -706,8 +706,8 @@@ admin.site.register(Deployment, Deploym
  admin.site.register(Site, SiteAdmin)
  admin.site.register(Slice, SliceAdmin)
  admin.site.register(Project, ProjectAdmin)
+ admin.site.register(ServiceClass, ServiceClassAdmin)
+ admin.site.register(Reservation, ReservationAdmin)
  
  if showAll:
      admin.site.register(Tag, TagAdmin)
@@@ -710,7 -716,5 +716,5 @@@
      admin.site.register(SitePrivilege, SitePrivilegeAdmin)
      admin.site.register(Role, RoleAdmin)
      admin.site.register(Sliver, SliverAdmin)
-     admin.site.register(ServiceClass, ServiceClassAdmin)
-     admin.site.register(Reservation, ReservationAdmin)
      admin.site.register(Image, ImageAdmin)