From 70bfd40b8c62ce7b477bc030f6c39ebedf233599 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Apr 19 2018 02:21:21 +0000
Subject: Merge remote-tracking branch 'origin/master' into el6


---

diff --git a/.gitignore b/.gitignore
index db2219e..7b4cb0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@
 /ansible-2.4.2.0.tar.gz
 /ansible-2.4.3.0.tar.gz
 /ansible-2.5.0.tar.gz
+/ansible-2.5.1.tar.gz
diff --git a/ansible.spec b/ansible.spec
index 863f577..436a211 100644
--- a/ansible.spec
+++ b/ansible.spec
@@ -28,16 +28,14 @@
 
 Name: ansible
 Summary: SSH-based configuration management, deployment, and task execution system
-Version: 2.5.0
-Release: 2%{?dist}
+Version: 2.5.1
+Release: 1%{?dist}
 
 Group: Development/Libraries
 License: GPLv3+
 Source0: https://releases.ansible.com/ansible/%{name}-%{version}.tar.gz
 # Docs fixes from master branch
 Patch0: https://github.com/ansible/ansible/commit/28015d8ae9831c272d16ce0ae2a57ccff3b445c7.patch
-Patch1: https://github.com/ansible/ansible/commit/f237508caa6e99aafb8691b148b41371105d12e7.patch
-Patch2: https://github.com/ansible/ansible/commit/4b406de19ae66263c3623d82db6b93d7d112018a.patch
 
 # Patch to utilize a newer jinja2 package on epel6
 # Non-upstreamable as it creates a dependency on a specific version of jinja.
@@ -253,8 +251,6 @@ This package installs extensive documentation for ansible
 %setup -q
 
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %if 0%{?rhel} == 6
 %patch100 -p1
@@ -370,7 +366,7 @@ popd
 %exclude %{_bindir}/ansible*-3*
 %endif  # python3 and 2
 %config(noreplace) %{_sysconfdir}/ansible/
-%doc README.md PKG-INFO COPYING changelogs/CHANGELOG-v2.5.rst
+%doc README.rst PKG-INFO COPYING changelogs/CHANGELOG-v2.5.rst
 %doc %{_mandir}/man1/ansible*
 
 %if 0%{?with_python3}
@@ -378,7 +374,7 @@ popd
 %files -n ansible-python3
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/ansible/
-%doc README.md PKG-INFO COPYING changelogs/CHANGELOG-v2.5.rst
+%doc README.rst PKG-INFO COPYING changelogs/CHANGELOG-v2.5.rst
 %doc %{_mandir}/man1/ansible*
 %{_bindir}/ansible*-3*
 %endif # python2
@@ -392,6 +388,9 @@ popd
 %endif
 
 %changelog
+* Wed Apr 18 2018 Kevin Fenzi <kevin@scrye.com> - 2.5.1-1
+- Update to 2.5.1 with bugfixes. Fixes: #1569270 #1569153 #1566004 #1566001
+
 * Tue Mar 27 2018 Kevin Fenzi <kevin@scrye.com> - 2.5.0-2
 - Some additional python3 fixes. Thanks churchyard!
 
diff --git a/sources b/sources
index d895de3..2a22428 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ansible-2.5.0.tar.gz) = 93dee0404c5de0a9c8c5b8987f1fb2dbacceb848e8d5b4c70c5a6692d6fe8e9d4bec67d592071346f458b46b9ed2d800609a080d7d4b16266943f32d56a19220
+SHA512 (ansible-2.5.1.tar.gz) = d5ed9ba4bb514b79254a79a89d1572e80c5cfb1db2a67a980184aa3c26ff407f5c5c9bd0efa24f0e00af451d955f3b0d8d9ad3026be71ba7ad12487a1631ad9a