Merged in sysvm hack.

diff --git a/debian/changelog b/debian/changelog
index 272919c..3ed605c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xvm-prodconfig (1.1.49) unstable; urgency=low
+
+  * Adding xh5-xh8 to the cluster.
+
+ -- Steven Valdez <dvorak42@mit.edu>  Tue, 23 Jul 2013 15:23:46 -0400
+
 xvm-prodconfig (1.1.48~migration8) precise; urgency=low
 
   * fix kernel/initrd paths for s_master

diff --git a/master.yaml b/master.yaml
index b05bd19..30772ff 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -123,26 +123,26 @@ hosts: # hosts on which VMs run
     - 18.4.58.19
     - 18.5.58.19
    ip: 18.181.0.224
-# - hostname: discovery-one.mit.edu
-#   internal_ips:
-#    - 18.4.58.20
-#    - 18.5.58.20
-#   ip: 18.181.0.225
-# - hostname: global-dynamics.mit.edu
-#   internal_ips:
-#    - 18.4.58.21
-#    - 18.5.58.21
-#   ip: 18.181.0.99
-# - hostname: babylon-four.mit.edu
-#   internal_ips:
-#    - 18.4.58.22
-#    - 18.5.58.22
-#   ip: 18.181.0.100
-# - hostname: moonbase-alpha.mit.edu
-#   internal_ips:
-#    - 18.4.58.23
-#    - 18.5.58.23
-#   ip: 18.181.0.101
+ - hostname: discovery-one.mit.edu
+   internal_ips:
+    - 18.4.58.20
+    - 18.5.58.20
+   ip: 18.181.0.225
+ - hostname: global-dynamics.mit.edu
+   internal_ips:
+    - 18.4.58.21
+    - 18.5.58.21
+   ip: 18.181.0.99
+ - hostname: babylon-four.mit.edu
+   internal_ips:
+    - 18.4.58.22
+    - 18.5.58.22
+   ip: 18.181.0.100
+ - hostname: moonbase-alpha.mit.edu
+   internal_ips:
+    - 18.4.58.23
+    - 18.5.58.23
+   ip: 18.181.0.101
 
 kerberos:
  realm: ATHENA.MIT.EDU