aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/04_relax_nosetests_options.patch
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2015-12-22 14:15:26 +0000
committerChristopher Baines <mail@cbaines.net>2015-12-22 14:15:26 +0000
commit6b4e166f2475c4be0df7d82dc4d86aa43c6cb066 (patch)
treeeb8f0fa0ed67f14cc5c5645f6bb12494e7966e98 /debian/patches/04_relax_nosetests_options.patch
parentb6983c7c258a0ce3365f7c7409f2a06a8ed70bca (diff)
parent24ae6ba32069ca15f4a163e386964a3accdccf63 (diff)
downloadpython-urllib3-6b4e166f2475c4be0df7d82dc4d86aa43c6cb066.tar
python-urllib3-6b4e166f2475c4be0df7d82dc4d86aa43c6cb066.tar.gz
merge patched into master
Diffstat (limited to 'debian/patches/04_relax_nosetests_options.patch')
-rw-r--r--debian/patches/04_relax_nosetests_options.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/patches/04_relax_nosetests_options.patch b/debian/patches/04_relax_nosetests_options.patch
index b898d19..a52b940 100644
--- a/debian/patches/04_relax_nosetests_options.patch
+++ b/debian/patches/04_relax_nosetests_options.patch
@@ -1,4 +1,4 @@
-From 28953c4c9c5ad7893bd392658016019fbf78088a Mon Sep 17 00:00:00 2001
+From 11c93ac43225db29b9c7ead00e704ce97a11f89c Mon Sep 17 00:00:00 2001
From: Daniele Tricoli <eriol@mornie.org>
Date: Thu, 8 Oct 2015 13:19:50 -0700
Subject: Do not use logging-clear-handlers to see all logging output and
@@ -14,7 +14,7 @@ Patch-Name: 04_relax_nosetests_options.patch
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/setup.cfg b/setup.cfg
-index 6a64ffa..25a6815 100644
+index b5fe992..ca24a71 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,8 +1,8 @@