summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2015-05-05 10:23:10 -0500
committerJames Cammarata <jimi@sngx.net>2015-05-05 10:28:43 -0500
commitba822ce0f9383c979fff8f93d945227f905f0952 (patch)
tree999b94edf1280a5deff6c182e7876f84b547c8db /packaging
parent6694db7d569689b2ac97e8300c63e270fd200c25 (diff)
downloadansible-ba822ce0f9383c979fff8f93d945227f905f0952.tar.gz
Backporting release info/changelog stuff to devel
Diffstat (limited to 'packaging')
-rw-r--r--packaging/debian/changelog11
-rw-r--r--packaging/rpm/ansible.spec6
2 files changed, 14 insertions, 3 deletions
diff --git a/packaging/debian/changelog b/packaging/debian/changelog
index 84bf7e7703..311da7fda7 100644
--- a/packaging/debian/changelog
+++ b/packaging/debian/changelog
@@ -3,13 +3,18 @@ ansible (%VERSION%-%RELEASE%~%DIST%) %DIST%; urgency=low
* %VERSION% release
-- Ansible, Inc. <support@ansible.com> %DATE%
->>>>>>> Stashed changes
+
+ansible (1.9.1) unstable; urgency=low
+
+ * 1.9.1
+
+ -- Ansible, Inc. <support@ansible.com> Mon, 27 Apr 2015 17:00:00 -0500
ansible (1.9.0.1) unstable; urgency=low
- * 1.9 release
+ * 1.9.0.1
- -- Ansible, Inc. <support@ansible.com> Wed, 25 Mar 2015 17:00:00 -0500
+ -- Ansible, Inc. <support@ansible.com> Wed, 25 Mar 2015 15:00:00 -0500
ansible (1.8.4) unstable; urgency=low
diff --git a/packaging/rpm/ansible.spec b/packaging/rpm/ansible.spec
index 8ae7286b63..394017dc0f 100644
--- a/packaging/rpm/ansible.spec
+++ b/packaging/rpm/ansible.spec
@@ -110,6 +110,12 @@ rm -rf %{buildroot}
%changelog
+* Mon Apr 27 2015 Ansible, Inc. <support@ansible.com> - 1.9.1
+- Release 1.9.1
+
+* Wed Mar 25 2015 Ansible, Inc. <support@ansible.com> - 1.9.0
+- Release 1.9.0
+
* Thu Feb 19 2015 Ansible, Inc. <support@ansible.com> - 1.8.4
- Release 1.8.4