[Python-modules-commits] [django-haystack] 02/03: record new upstream branch created by importing django-haystack_2.4.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 ab01bbd03ead24126c0a29d9d9e8e07ec86929b6
Merge: 66520b4 b26fb57
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Wed Nov 4 13:08:16 2015 +0100

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

 PKG-INFO                                   |  3 +-
 README.rst                                 |  1 +
 debian/.git-dpm                            | 14 +++++-----
 django_haystack.egg-info/PKG-INFO          |  3 +-
 django_haystack.egg-info/pbr.json          |  2 +-
 docs/conf.py                               |  8 +++---
 docs/faceting.rst                          | 12 +++-----
 docs/installing_search_engines.rst         |  6 ++--
 haystack/__init__.py                       |  2 +-
 haystack/backends/__init__.py              |  2 +-
 haystack/backends/elasticsearch_backend.py | 44 ++++++++++++++++++------------
 haystack/backends/simple_backend.py        |  2 +-
 haystack/backends/solr_backend.py          | 32 ++++++++++++----------
 haystack/backends/whoosh_backend.py        | 24 +++++++++-------
 haystack/generic_views.py                  | 11 ++++++--
 haystack/indexes.py                        |  2 +-
 haystack/models.py                         |  4 +--
 haystack/query.py                          | 21 ++++++++------
 setup.py                                   |  2 +-
 19 files changed, 108 insertions(+), 87 deletions(-)

diff --cc debian/.git-dpm
index e853a74,0000000..652ebce
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
- 388a92acd5db6c36f4c721555d7f65df2ab3c65d
- 388a92acd5db6c36f4c721555d7f65df2ab3c65d
- 388a92acd5db6c36f4c721555d7f65df2ab3c65d
- 388a92acd5db6c36f4c721555d7f65df2ab3c65d
- django-haystack_2.4.0.orig.tar.gz
- 0dbc58142cf369b562050d51ec553f90e6223466
- 160432
++b26fb57547f22e0ad9b1381c59bea34e0a481815
++b26fb57547f22e0ad9b1381c59bea34e0a481815
++b26fb57547f22e0ad9b1381c59bea34e0a481815
++b26fb57547f22e0ad9b1381c59bea34e0a481815
++django-haystack_2.4.1.orig.tar.gz
++92a06aa029a18579f3e1f8656ab52b5fb151c0bf
++160757
 +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