[Python-modules-commits] [python-flaky] 03/05: record new upstream branch created by importing python-flaky_3.1.0.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 bac59665946901dc4e622e2575d1a4584080ebda
Merge: bdded1a 72d24af
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date:   Wed Feb 17 18:04:27 2016 +0200

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

 HISTORY.rst                              |  8 +++
 MANIFEST.in                              |  1 +
 debian/.git-dpm                          | 14 ++---
 flaky/flaky_nose_plugin.py               |  6 +--
 flaky/flaky_pytest_plugin.py             | 92 +++++++++++++++-----------------
 setup.cfg                                |  5 ++
 setup.py                                 | 32 +++++++++--
 test/test_nose/test_flaky_nose_plugin.py |  4 +-
 tox.ini                                  |  1 +
 9 files changed, 100 insertions(+), 63 deletions(-)

diff --cc debian/.git-dpm
index fcfde46,0000000..59b273a
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
- 0c2dd2ce9a80825c775fe19c2c40f59e5130b1c7
- 0c2dd2ce9a80825c775fe19c2c40f59e5130b1c7
- 0c2dd2ce9a80825c775fe19c2c40f59e5130b1c7
- 0c2dd2ce9a80825c775fe19c2c40f59e5130b1c7
- python-flaky_3.0.2.orig.tar.gz
- cc451cdde17e07ac752762b3f3d58a0c8057e1cf
- 34181
++72d24afd33b57f7f2f7e8994ac04b08e6a7512e5
++72d24afd33b57f7f2f7e8994ac04b08e6a7512e5
++72d24afd33b57f7f2f7e8994ac04b08e6a7512e5
++72d24afd33b57f7f2f7e8994ac04b08e6a7512e5
++python-flaky_3.1.0.orig.tar.gz
++a5f67bff98c86bf81b905ae776cd052e4c8ddf21
++34687
 +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