Clean up stray conflict markers.

[invirt/packages/xvm-prodconfig.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 4b392c6..629dbb0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,46 @@
+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
+
+ -- Evan Broder <broder@mit.edu>  Sat, 15 Nov 2008 23:35:03 -0500
+
+xvm-prodconfig (1.0.3) unstable; urgency=low
+
+  * The trac URI doesn't want a trailing slash
+
+ -- Evan Broder <broder@mit.edu>  Sat, 15 Nov 2008 23:28:58 -0500
+
+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
+
+xvm-prodconfig (1.0.1) unstable; urgency=low
+
+  * Forgot to change the webacl
+
+ -- Evan Broder <broder@mit.edu>  Sat, 15 Nov 2008 11:12:09 -0500
+
+xvm-prodconfig (1.0.0) unstable; urgency=low
+
+  * Prod launch!
+
+ -- Evan Broder <broder@mit.edu>  Fri, 14 Nov 2008 14:34:50 -0500
+
+xvm-prodconfig (0.21) unstable; urgency=low
+
+  * Add the two remaining hosts - we can comment them out on
+    xvm-remote-dev until they're activated
+
+ -- Evan Broder <broder@mit.edu>  Tue, 04 Nov 2008 04:10:22 -0500
+
 xvm-prodconfig (0.20) unstable; urgency=low
 
   * Take advantage of multi-word zonefile entries by adding explanations