[Python-modules-commits] [django-haystack] 02/04: record new upstream branch created by importing django-haystack_2.5.1.orig.tar.gz and merge it

[Michael Fladischer]

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

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

commit 11a56c34979aa65045dc8d63c28f06b3f405cc16
Merge: 170daf4 54f8cc3
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Tue Jan 3 15:00:34 2017 +0100

    record new upstream branch created by importing django-haystack_2.5.1.orig.tar.gz and merge it

 .gitignore                                         |  4 ++-
 .travis.yml                                        |  4 +--
 AUTHORS                                            |  2 ++
 README.rst                                         |  1 +
 debian/.git-dpm                                    | 14 ++++----
 docs/backend_support.rst                           |  2 +-
 docs/best_practices.rst                            |  6 ++--
 docs/changelog.rst                                 | 19 +++++-----
 docs/searchindex_api.rst                           | 20 +++++------
 docs/searchqueryset_api.rst                        | 25 +++++++++++--
 haystack/backends/__init__.py                      |  3 +-
 haystack/backends/elasticsearch_backend.py         |  6 ++--
 haystack/backends/solr_backend.py                  | 14 ++++++--
 haystack/backends/whoosh_backend.py                |  6 ++--
 haystack/constants.py                              |  3 +-
 haystack/management/commands/rebuild_index.py      |  4 +++
 haystack/management/commands/update_index.py       |  6 ++--
 haystack/utils/__init__.py                         |  5 ++-
 setup.py                                           |  4 +--
 .../test_elasticsearch_backend.py                  |  9 +++--
 .../test_elasticsearch_query.py                    | 10 ++++++
 test_haystack/settings.py                          |  4 +--
 test_haystack/solr_tests/test_solr_backend.py      | 26 ++++++++++----
 test_haystack/solr_tests/test_solr_query.py        | 11 +++++-
 test_haystack/test_managers.py                     |  4 +--
 test_haystack/test_query.py                        | 42 +++++++++++-----------
 test_haystack/test_views.py                        |  3 +-
 test_haystack/whoosh_tests/test_whoosh_backend.py  |  9 +++--
 test_haystack/whoosh_tests/test_whoosh_query.py    | 10 ++++++
 tox.ini                                            | 31 ++++++++++++++++
 30 files changed, 214 insertions(+), 93 deletions(-)

diff --cc debian/.git-dpm
index c52f349,0000000..6949397
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
- a01b8d38d39411729039d34913668a9eb2787451
- a01b8d38d39411729039d34913668a9eb2787451
- a01b8d38d39411729039d34913668a9eb2787451
- a01b8d38d39411729039d34913668a9eb2787451
- django-haystack_2.5.0.orig.tar.gz
- 58818565e32fa5e8d73f04bd7d5dc5623e3b773b
- 364484
++54f8cc3685c3806f4f590ec7c938979443c7bb9a
++54f8cc3685c3806f4f590ec7c938979443c7bb9a
++54f8cc3685c3806f4f590ec7c938979443c7bb9a
++54f8cc3685c3806f4f590ec7c938979443c7bb9a
++django-haystack_2.5.1.orig.tar.gz
++f956f08b935af9d349051c960ff19c1bd641797e
++365512
 +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/django-haystack.git