ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-08-20 21:11:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix merge conflicts from 1.5.1 release notes

Browse source
This commit is contained in:
James Tanner 2014-03-10 18:55:17 -04:00
commit 7b6d5e7bbf
5 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
packaging/debian/changelog
View file

@ -4,12 +4,21 @@ ansible (1.6) unstable; urgency=low
-- Michael DeHaan <michael.dehaan@gmail.com> Fri, 28 February 2014 15:00:03 -0500
ansible (1.5.1) unstable; urgency=low
* 1.5.1 release
-- Michael DeHaan <michael@ansible.com> Mon, 10 March 2014 17:33:44 -0500
ansible (1.5) unstable; urgency=low
* 1.5 release
<<<<<<< HEAD
-- Michael DeHaan <michael.dehaan@gmail.com> Fri, 28 February 2014 15:00:02 -0500
=======
-- Michael DeHaan <michael@ansible.com> Fri, 28 February 2014 00:00:00 -0500
>>>>>>> 16c05cbc8892041cacba3ff87c86e68b86b4511b
ansible (1.4.5) unstable; urgency=low

8
packaging/rpm/ansible.spec
View file

@ -102,8 +102,16 @@ rm -rf %{buildroot}
%changelog
<<<<<<< HEAD
* Thu Feb 28 2014 Michael DeHaan <michael.dehaan@gmail.com> - 1.6-0
* (PENDING)
=======
* Fri Mar 10 2014 Michael DeHaan <michael@ansible.com> - 1.5.1
- Release 1.5.1
* Fri Feb 28 2014 Michael DeHaan <michael@ansible.com> - 1.5.0
- Release 1.5.0
>>>>>>> 16c05cbc8892041cacba3ff87c86e68b86b4511b
* Thu Feb 28 2014 Michael DeHaan <michael.dehaan@gmail.com> - 1.5-0
* Release 1.5