[Python-modules-commits] [django-haystack] 02/07: record new upstream branch created by importing django-haystack_2.6.0.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 experimental
in repository django-haystack.

commit 065d8c6c9acc58c689e7e876f4cbd1f4eccdfb4f
Merge: 372b696 94262c4
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Mon Jan 9 11:21:16 2017 +0100

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

 .travis.yml                                        |   28 +-
 AUTHORS                                            |    1 +
 README.rst                                         |    2 +-
 debian/.git-dpm                                    |   14 +-
 docs/backend_support.rst                           |    2 +-
 docs/changelog.rst                                 |  284 +++-
 docs/installing_search_engines.rst                 |    6 +-
 docs/management_commands.rst                       |   16 +-
 docs/searchqueryset_api.rst                        |    2 +-
 haystack/__init__.py                               |   10 +-
 haystack/backends/__init__.py                      |    2 +
 haystack/backends/elasticsearch2_backend.py        |  333 +++++
 haystack/fields.py                                 |    2 +-
 haystack/models.py                                 |    2 +-
 setup.py                                           |    4 +-
 test_haystack/core/custom_identifier.py            |    8 +-
 test_haystack/elasticsearch2_tests/__init__.py     |   29 +
 test_haystack/elasticsearch2_tests/test_backend.py | 1498 ++++++++++++++++++++
 test_haystack/elasticsearch2_tests/test_inputs.py  |   85 ++
 test_haystack/elasticsearch2_tests/test_query.py   |  209 +++
 test_haystack/elasticsearch_tests/__init__.py      |   14 +-
 test_haystack/settings.py                          |   10 +
 test_haystack/solr_tests/test_solr_backend.py      |    7 +
 test_haystack/test_managers.py                     |    2 +-
 test_haystack/test_utils.py                        |   14 +-
 tox.ini                                            |  184 ++-
 26 files changed, 2689 insertions(+), 79 deletions(-)

diff --cc debian/.git-dpm
index 6949397,0000000..15053f0
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
- 54f8cc3685c3806f4f590ec7c938979443c7bb9a
- 54f8cc3685c3806f4f590ec7c938979443c7bb9a
- 54f8cc3685c3806f4f590ec7c938979443c7bb9a
- 54f8cc3685c3806f4f590ec7c938979443c7bb9a
- django-haystack_2.5.1.orig.tar.gz
- f956f08b935af9d349051c960ff19c1bd641797e
- 365512
++94262c46ad4df6b0f7f23cf2478acc2ecf0c52fe
++94262c46ad4df6b0f7f23cf2478acc2ecf0c52fe
++94262c46ad4df6b0f7f23cf2478acc2ecf0c52fe
++94262c46ad4df6b0f7f23cf2478acc2ecf0c52fe
++django-haystack_2.6.0.orig.tar.gz
++9634a5ce98632ab5e91dc37148b189d60e1ef71e
++382724
 +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