Merging new sysvm definitions

diff --git a/debian/changelog b/debian/changelog
index 764c17f..78ba97d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,21 @@
+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.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
 

diff --git a/master.yaml b/master.yaml
index 30772ff..5145e51 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -162,6 +162,11 @@ remote:
 git:
  uri: git://xvm.mit.edu
 
+noc:
+ dbname: template1
+ user: nagios
+ ip: 18.181.0.65
+
 trac:
  uri: https://xvm.scripts.mit.edu
 
@@ -181,6 +186,9 @@ web:
   - quentin
   - gdb
   - mitchb
+  - achernya
+  - dvorak42
+  - glasgall
 
 network:
  netmask: 255.255.0.0