[Python-modules-commits] [python-spur] 12/13: record new upstream branch and merge it

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository python-spur.

commit a4dc3050a16d75db730e5f289c3965dbb81b10e1
Merge: 9e6f113 6f69188
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Jan 3 11:33:42 2016 +0100

    record new upstream branch and merge it

 CHANGES                   |  8 +++++
 README.rst                | 36 ++++++++++++++++----
 debian/.git-dpm           | 14 ++++----
 setup.py                  |  3 +-
 spur/io.py                | 85 ++++++++++++++++++++++++++++++++++-------------
 spur/local.py             | 44 ++++++++++++++++--------
 spur/results.py           | 24 ++++++++-----
 spur/ssh.py               | 19 +++++++----
 tests/process_test_set.py | 27 +++++++++++++++
 tox.ini                   |  3 +-
 10 files changed, 194 insertions(+), 69 deletions(-)

diff --cc debian/.git-dpm
index 2ce980c,0000000..bfa1c1d
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
- 24b117e84f4713f59598eda11348037301cb6574
- 24b117e84f4713f59598eda11348037301cb6574
- 24b117e84f4713f59598eda11348037301cb6574
- 24b117e84f4713f59598eda11348037301cb6574
- python-spur_0.3.14.orig.tar.gz
- 3966a71da8b4f61e5a30e75d9259d32e1975758e
- 14378
++6f69188d213d2136ea6da57563de864b6f379d03
++6f69188d213d2136ea6da57563de864b6f379d03
++6f69188d213d2136ea6da57563de864b6f379d03
++6f69188d213d2136ea6da57563de864b6f379d03
++python-spur_0.3.15.orig.tar.gz
++6b1d1753a73dd5e62330909b4e53e9c02b5f3db0
++15378
 +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-spur.git