Index: trunk/packages/sipb-xen-database/debian/changelog
===================================================================
--- trunk/packages/sipb-xen-database/debian/changelog	(revision 842)
+++ trunk/packages/sipb-xen-database/debian/changelog	(revision 874)
@@ -1,2 +1,9 @@
+sipb-xen-database (10.18) unstable; urgency=low
+
+  * add 'adminable' column to machines; for selectively, temporarily,
+    enabling admin mode on a machine
+
+ -- Greg Price <price@mit.edu>  Wed,  6 Aug 2008 01:02:59 -0400
+
 sipb-xen-database (10.17) unstable; urgency=low
 
Index: trunk/packages/sipb-xen-database/python/database/models.py
===================================================================
--- trunk/packages/sipb-xen-database/python/database/models.py	(revision 842)
+++ trunk/packages/sipb-xen-database/python/database/models.py	(revision 874)
@@ -21,4 +21,5 @@
            'CDROM',
            'Autoinstall',
+           'or_',
            ]
 
@@ -37,5 +38,6 @@
        Column('type_id', String, ForeignKey('types.type_id'), nullable=False),
        Column('autorestart', Boolean, nullable=False, default=False),
-       Column('cpus', Integer, nullable=False, default=1))
+       Column('cpus', Integer, nullable=False, default=1),
+       Column('adminable', Boolean, nullable=False, default=False))
 
 nic_table = Table('nics', meta,