[Python-modules-commits] [pytest-httpbin] 02/14: record new upstream branch created by importing pytest-httpbin_0.2.0.orig.tar.xz and merge it

[Daniel Stender]

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

danstender-guest pushed a commit to branch master
in repository pytest-httpbin.

commit 9c6d51bb1ca3a523cb8e3326526772c6b0603b70
Merge: 17f25bd 3dadf8e
Author: Daniel Stender <stender at debian.org>
Date:   Thu Mar 17 20:31:57 2016 +0100

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

 MANIFEST.in               |  1 +
 README.md                 |  5 +++
 debian/.git-dpm           | 14 ++++----
 pytest_httpbin/serve.py   | 88 ++++++++++++++++++++++++++++++-----------------
 pytest_httpbin/version.py |  2 +-
 tests/test_server.py      | 22 ++++--------
 6 files changed, 76 insertions(+), 56 deletions(-)

diff --cc debian/.git-dpm
index 6c02886,0000000..01cbed9
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
- 98d7365a5755073a515e51820773c10e4235f474
- 98d7365a5755073a515e51820773c10e4235f474
- 98d7365a5755073a515e51820773c10e4235f474
- 98d7365a5755073a515e51820773c10e4235f474
- pytest-httpbin_0.1.1.orig.tar.xz
- ac9bc736e089f769a3c5f9a3d515aee935424b6b
- 11780
++3dadf8e2bea17bf5a7f01c51a2aa5ac413c304ad
++3dadf8e2bea17bf5a7f01c51a2aa5ac413c304ad
++3dadf8e2bea17bf5a7f01c51a2aa5ac413c304ad
++3dadf8e2bea17bf5a7f01c51a2aa5ac413c304ad
++pytest-httpbin_0.2.0.orig.tar.xz
++cfbebaee6bae228302ce34c9de5a9c5946fda845
++11952
 +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-httpbin.git