[ckan-changes] [okfn/ckan] 860fa8: Merge branch 'release-v1.5.1' to master.

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/okfn/ckan

  Commit: 860fa8b9dc284d33903955d9b3d5a8e3d58daa8e
      https://github.com/okfn/ckan/commit/860fa8b9dc284d33903955d9b3d5a8e3d58daa8e
  Author: David Read <david.read at okfn.org>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    M ckan/config/environment.py
  R ckan/config/schema.xml
  A ckan/config/solr/CHANGELOG.txt
  A ckan/config/solr/README.txt
  A ckan/config/solr/schema-1.2.xml
  A ckan/config/solr/schema-1.3.xml
  M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  A ckan/tests/lib/solr/schema-no-version.xml
  A ckan/tests/lib/solr/schema-wrong-version.xml
  A ckan/tests/lib/test_solr_schema_version.py
  M ckan/tests/lib/test_solr_search_index.py
  M doc/configuration.rst
  M doc/index.rst
  M doc/install-from-package.rst
  M doc/install-from-source.rst
  A doc/solr-setup.rst

  Log Message:
  -----------
  Merge branch 'release-v1.5.1' to master.

Conflicts:
	ckan/lib/search/query.py
	ckan/tests/functional/api/test_action.py