[Python-modules-commits] [pytest-localserver] 02/07: record new upstream branch created by importing pytest-localserver_0.3.6.orig.tar.xz and merge it

[Daniel Stender]

This is an automated email from the git hooks/post-receive script.

stender pushed a commit to branch master
in repository pytest-localserver.

commit 2733a5ff17cffc292490d3708d151f420deed0d3
Merge: e099f3b 11da907
Author: Daniel Stender <stender at debian.org>
Date:   Sun Aug 28 13:29:28 2016 +0200

    record new upstream branch created by importing pytest-localserver_0.3.6.orig.tar.xz and merge it

 PKG-INFO                       | 15 ++++++++-------
 README                         |  9 +++++----
 debian/.git-dpm                | 14 +++++++-------
 pytest_localserver/__init__.py |  2 +-
 pytest_localserver/https.py    |  2 +-
 pytest_localserver/plugin.py   | 10 +++++++---
 pytest_localserver/server.csr  | 28 ----------------------------
 setup.py                       |  6 +++---
 tests/test_http.py             |  7 +++----
 tests/test_https.py            |  7 +++----
 tests/test_smtp.py             |  7 +++----
 11 files changed, 41 insertions(+), 66 deletions(-)

diff --cc debian/.git-dpm
index 13ab1f3,0000000..019fa14
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- aeeac0f2985da0666c221b4211a6d511e8b47318
- aeeac0f2985da0666c221b4211a6d511e8b47318
- aeeac0f2985da0666c221b4211a6d511e8b47318
- aeeac0f2985da0666c221b4211a6d511e8b47318
- pytest-localserver_0.3.5.orig.tar.xz
- 957b075e192dc00e716ca829659d527b2993c307
- 16904
++11da907122e2b76141462153b3cd380915480849
++11da907122e2b76141462153b3cd380915480849
++11da907122e2b76141462153b3cd380915480849
++11da907122e2b76141462153b3cd380915480849
++pytest-localserver_0.3.6.orig.tar.xz
++d11cdaa5fa211f0da8bc99a436fa96fd5660eb1d
++15564
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pytest-localserver.git