← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~andreserl/maas/reenable-after-commission into lp:maas

 

Andres Rodriguez has proposed merging lp:~andreserl/maas/reenable-after-commission into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~andreserl/maas/reenable-after-commission/+merge/114206
-- 
https://code.launchpad.net/~andreserl/maas/reenable-after-commission/+merge/114206
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~andreserl/maas/reenable-after-commission into lp:maas.
=== modified file 'src/maasserver/enum.py'
--- src/maasserver/enum.py	2012-06-25 13:40:20 +0000
+++ src/maasserver/enum.py	2012-07-10 14:53:20 +0000
@@ -76,18 +76,18 @@
     #:
     QUEUE = 0
     #:
-    #CHECK = 1
+    CHECK = 1
     #:
-    #DEPLOY_12_04 = 2
+    DEPLOY_12_04 = 2
 
 
 NODE_AFTER_COMMISSIONING_ACTION_CHOICES = (
     (NODE_AFTER_COMMISSIONING_ACTION.QUEUE,
         "Queue for dynamic allocation to services"),
-    #(NODE_AFTER_COMMISSIONING_ACTION.CHECK,
-    #    "Check compatibility and hold for future decision"),
-    #(NODE_AFTER_COMMISSIONING_ACTION.DEPLOY_12_04,
-    #    "Deploy with Ubuntu 12.04 LTS"),
+    (NODE_AFTER_COMMISSIONING_ACTION.CHECK,
+        "Check compatibility and hold for future decision"),
+    (NODE_AFTER_COMMISSIONING_ACTION.DEPLOY_12_04,
+        "Deploy with Ubuntu 12.04 LTS"),
 )
 
 


Follow ups