From: Steven Valdez <dvorak42@mit.edu>
Date: Thu, 1 Aug 2013 19:55:04 +0000 (-0400)
Subject: Merging new sysvm definitions
X-Git-Tag: 1.1.52~1
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-prodconfig.git/commitdiff_plain/e9b0da38f0691330dd680eedd4108ea62366e6db

Merging new sysvm definitions
---

e9b0da38f0691330dd680eedd4108ea62366e6db
diff --cc debian/changelog
index faf5713,764c17f..78ba97d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,9 +1,22 @@@
- xvm-prodconfig (1.1.51) unstable; urgency=low
++xvm-prodconfig (1.1.52) unstable; urgency=low
 +
 +  * Adding noc config for db.
 +
 + -- Steven Valdez <dvorak42@mit.edu>  Thu, 01 Aug 2013 15:53:53 -0400
 +
- xvm-prodconfig (1.1.50) unstable; urgency=low
++xvm-prodconfig (1.1.51) unstable; urgency=low
 +
 +  * Adding achernya, glasgall, dvorak42 to errormail_exclude.
 +
 + -- Steven Valdez <dvorak42@mit.edu>  Tue, 23 Jul 2013 23:41:12 -0400
 +
+ xvm-prodconfig (1.1.50) precise; urgency=low
+ 
+   * Update s_remote and s_console sysvm definitions for precise.
+ 
+  -- Adam Glasgall <glasgall@mit.edu>  Tue, 23 Jul 2013 23:43:44 -0400
++>>>>>>> origin/glasgall-precise
+ 
  xvm-prodconfig (1.1.49) unstable; urgency=low
  
    * Adding xh5-xh8 to the cluster.