[Python-modules-commits] [python-flaky] 02/02: 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 jessie-backports
in repository python-flaky.

commit 9cc64e20f3bb9607faf1bc50519a51ac0078d9fd
Merge: e8220e8 dfbdbed
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date:   Wed Feb 17 18:02:28 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..eb45e52
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
++dfbdbed6f8a75856fd713244afcb6097b1e0ad8c
++dfbdbed6f8a75856fd713244afcb6097b1e0ad8c
++dfbdbed6f8a75856fd713244afcb6097b1e0ad8c
++dfbdbed6f8a75856fd713244afcb6097b1e0ad8c
++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