X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-prodconfig.git/blobdiff_plain/8c98d0f49e945d0d5fdf11e138ba69f8bae99def..1d51350dab4d099bc2aa2514a88bd9c4c85340a2:/debian/changelog?ds=sidebyside

diff --git a/debian/changelog b/debian/changelog
index af1f40a..33a9906 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xvm-prodconfig (1.1.0) unstable; urgency=low
+
+    * Add a specification for a monitoring host (in our case, syn)
+
+ -- Evan Broder <broder@mit.edu>  Sat, 22 Nov 2008 05:51:35 -0500
+
 xvm-prodconfig (1.0.4) unstable; urgency=low
 
   * Remove the stray dot from the config
@@ -15,6 +21,9 @@ xvm-prodconfig (1.0.2) unstable; urgency=low
   * Move trac over to scripts
 
  -- Evan Broder <broder@mit.edu>  Sat, 15 Nov 2008 23:13:33 -0500
+=======
+ -- Evan Broder <broder@mit.edu>  Fri, 21 Nov 2008 22:48:21 -0500
+>>>>>>> Add a specification for a monitoring host (i.e. syn):packages/xvm-prodconfig/debian/changelog
 
 xvm-prodconfig (1.0.1) unstable; urgency=low