summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-06-16 15:40:27 +0100
committerSimon MacMullen <simon@rabbitmq.com>2010-06-16 15:40:27 +0100
commite031cb9b8303d66401dc56eab8bd45a5f9b9e452 (patch)
tree621dfb1535583855c9d305882b1df9265a3a0741
parent1c95e37084f031036191dab792c82c8599bd477f (diff)
parent33f5df0c919a6880b59bd0640f801ceb8ab32a3b (diff)
downloadrabbitmq-server-git-e031cb9b8303d66401dc56eab8bd45a5f9b9e452.tar.gz
Merged heads
-rw-r--r--packaging/RPMS/Fedora/rabbitmq-server.spec3
-rw-r--r--packaging/debs/Debian/debian/changelog6
2 files changed, 9 insertions, 0 deletions
diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec
index 00066a15f7..c5950be4f4 100644
--- a/packaging/RPMS/Fedora/rabbitmq-server.spec
+++ b/packaging/RPMS/Fedora/rabbitmq-server.spec
@@ -128,6 +128,9 @@ done
rm -rf %{buildroot}
%changelog
+* Tue Jun 15 2010 Matthew Sackman <matthew@rabbitmq.com> 1.8.0-1
+- New Upstream Release
+
* Mon Feb 15 2010 Matthew Sackman <matthew@lshift.net> 1.7.2-1
- New Upstream Release
diff --git a/packaging/debs/Debian/debian/changelog b/packaging/debs/Debian/debian/changelog
index 63b50749e1..3c0d6937ea 100644
--- a/packaging/debs/Debian/debian/changelog
+++ b/packaging/debs/Debian/debian/changelog
@@ -1,3 +1,9 @@
+rabbitmq-server (1.8.0-1) intrepid; urgency=low
+
+ * New Upstream Release
+
+ -- Matthew Sackman <matthew@rabbitmq.com> Tue, 15 Jun 2010 12:48:48 +0100
+
rabbitmq-server (1.7.2-1) intrepid; urgency=low
* New Upstream Release