[Python-modules-commits] [python-flaky] 02/04: record new upstream branch created by importing python-flaky_3.3.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 1cb04b2e24cc9372a6d3f656c4bbb2d353d28fad
Merge: 06b0c2a c364537
Author: Tristan Seligmann <mithrandi at mithrandi.net>
Date:   Sat Aug 27 13:13:19 2016 +0200

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

 AUTHORS.rst                  |  1 +
 HISTORY.rst                  | 19 +++++++++++++++++++
 debian/.git-dpm              | 14 +++++++-------
 flaky/_flaky_plugin.py       | 41 ++++++++++++++++++++++++++++++++---------
 flaky/flaky_nose_plugin.py   | 25 ++++++-------------------
 flaky/flaky_pytest_plugin.py | 44 ++++++++++++++++++--------------------------
 setup.py                     |  2 +-
 7 files changed, 84 insertions(+), 62 deletions(-)

diff --cc debian/.git-dpm
index 72e8dc9,0000000..068a9d4
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
- ba70790ffba1e79754e0453a87bb8ae3acef043e
- ba70790ffba1e79754e0453a87bb8ae3acef043e
- ba70790ffba1e79754e0453a87bb8ae3acef043e
- ba70790ffba1e79754e0453a87bb8ae3acef043e
- python-flaky_3.1.1.orig.tar.gz
- b3d0e4f751325068caa2bef1b9bcf36df783123d
- 34749
++c364537a2a079e825f0e372475bdc759e8aa372e
++c364537a2a079e825f0e372475bdc759e8aa372e
++c364537a2a079e825f0e372475bdc759e8aa372e
++c364537a2a079e825f0e372475bdc759e8aa372e
++python-flaky_3.3.0.orig.tar.gz
++5ecf75edac47fc91aeceb2773a6acb8ee5fa221e
++34982
 +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