[Python-modules-commits] [drf-haystack] 13/17: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository drf-haystack.

commit 2384c30319e5e043981db4b10b164aa3b4db66b2
Merge: bb7f916 366db6e
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Sat Jan 2 17:49:24 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../patches/0002-Log-to-console-during-tests.patch | 42 ----------------------
 debian/patches/series                              |  1 -
 tests/settings.py                                  | 11 ++++--
 4 files changed, 10 insertions(+), 48 deletions(-)

diff --cc debian/.git-dpm
index 5c94d84,0000000..110d290
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 818ff5c90ee6f8405652335e72b97a179712d433
- 818ff5c90ee6f8405652335e72b97a179712d433
++366db6e9e18ee0564badead81b0d40b5a6cfc5bb
++366db6e9e18ee0564badead81b0d40b5a6cfc5bb
 +35215bc7a17f7fb475a8cc7b0975aaa106c7e5db
 +35215bc7a17f7fb475a8cc7b0975aaa106c7e5db
 +drf-haystack_1.5.6.orig.tar.gz
 +c78b75af307dd3ab56c0e5c378696901038c6df6
 +52734
diff --cc debian/patches/series
index f638db4,0000000..1ea586b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +python3-io.patch
- 0002-Log-to-console-during-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/drf-haystack.git