[Python-modules-commits] [python-flaky] 02/04: record new upstream branch created by importing python-flaky_3.1.1.orig.tar.gz and merge it

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository python-flaky.

commit daa4db749d0e2838f2a9c8388a51ae7394c5dee1
Merge: 66af616 ba70790
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date:   Wed Apr 6 23:02:24 2016 +0200

    record new upstream branch created by importing python-flaky_3.1.1.orig.tar.gz and merge it

 debian/.git-dpm                         | 14 +++++++-------
 flaky/flaky_pytest_plugin.py            |  3 ++-
 setup.py                                |  2 +-
 test/test_pytest/test_pytest_example.py |  8 +++++++-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --cc debian/.git-dpm
index 59b273a,0000000..72e8dc9
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
- 72d24afd33b57f7f2f7e8994ac04b08e6a7512e5
- 72d24afd33b57f7f2f7e8994ac04b08e6a7512e5
- 72d24afd33b57f7f2f7e8994ac04b08e6a7512e5
- 72d24afd33b57f7f2f7e8994ac04b08e6a7512e5
- python-flaky_3.1.0.orig.tar.gz
- a5f67bff98c86bf81b905ae776cd052e4c8ddf21
- 34687
++ba70790ffba1e79754e0453a87bb8ae3acef043e
++ba70790ffba1e79754e0453a87bb8ae3acef043e
++ba70790ffba1e79754e0453a87bb8ae3acef043e
++ba70790ffba1e79754e0453a87bb8ae3acef043e
++python-flaky_3.1.1.orig.tar.gz
++b3d0e4f751325068caa2bef1b9bcf36df783123d
++34749
 +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/python-flaky.git