[ckan-changes] [okfn/ckan] fee12f: Merge branch 'master' of github.com:okfn/ckan

[noreply at github.com]

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

  Commit: fee12f2688134cce3c3fd02cb5124ab950b3e09e
      https://github.com/okfn/ckan/commit/fee12f2688134cce3c3fd02cb5124ab950b3e09e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2011-12-12 (Mon, 12 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/navl/dictization_functions.py
  M ckan/lib/search/__init__.py
  M ckan/lib/search/index.py
  M ckan/logic/action/update.py
  M ckan/logic/schema.py
  M ckan/logic/validators.py
  M ckan/model/__init__.py
  M ckan/model/meta.py
  M ckan/public/css/style.css
  M ckan/public/scripts/application.js
  M ckan/templates/group/layout.html
  M ckan/templates/group/read.html
  M ckan/templates/layout_base.html
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_user.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/api.rst
  M doc/apiv3.rst
  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
  M pip-requirements-test.txt
  M setup.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan