Merge branch 'master' into f21

2015-04-22 10:08:18 -04:00 · 2015-04-22 10:08:18 -04:00 · a6eaa65ebe
commit a6eaa65ebe
parent 218293ed46 9dff84a0d3
3 changed files with 6 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -6,3 +6,4 @@
 /urllib3-1.10.tar.gz
 /urllib3-1.10.1.tar.gz
 /urllib3-1.10.2.tar.gz
+/urllib3-1.10.3.tar.gz
--- a/python-urllib3.spec
+++ b/python-urllib3.spec
@ -11,7 +11,7 @@
 %global srcname urllib3

 Name:           python-%{srcname}
-Version:        1.10.2
+Version:        1.10.3
 Release:        1%{?dist}
 Summary:        Python HTTP library with thread-safe connection pooling and file post

@ -167,6 +167,9 @@ rm -rf %{buildroot}/%{python3_sitelib}/__pycache__*
 %endif # with_python3

 %changelog
+* Wed Apr 22 2015 Ralph Bean <rbean@redhat.com> - 1.10.3-1
+- new version
+
 * Thu Feb 26 2015 Ralph Bean <rbean@redhat.com> - 1.10.2-1
 - new version

--- a/2
+++ b/2
@ -1 +1 @@
-e5b04971d8e6a77b591284d407e810fb  urllib3-1.10.2.tar.gz
+82fd4811f6164fcac0f8e959843c4a63  urllib3-1.10.3.tar.gz