[ckan-changes] [okfn/ckan] 5009db: Merge branch 'master' into feature-1608-move-stora...

Thu Jan 19 14:47:45 UTC 2012

  Branch: refs/heads/feature-1608-move-storage-to-core
  Home:   https://github.com/okfn/ckan
  Commit: 5009db9b265696a8a5018ba8fe3ba7e4f685868d
      https://github.com/okfn/ckan/commit/5009db9b265696a8a5018ba8fe3ba7e4f685868d
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-01-19 (Thu, 19 Jan 2012)

  Changed paths:
    A .gitattributes
  M .tx/config
  M CHANGELOG.txt
  A bin/canada.py
  A bin/status.py
  M build.sh
  M ckan/__init__.py
  M ckan/config/deployment.ini_tmpl
  M ckan/config/middleware.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/controllers/user.py
  M ckan/i18n/bg/LC_MESSAGES/ckan.po
  M ckan/i18n/ca/LC_MESSAGES/ckan.po
  M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
  M ckan/i18n/de/LC_MESSAGES/ckan.po
  M ckan/i18n/el/LC_MESSAGES/ckan.po
  M ckan/i18n/es/LC_MESSAGES/ckan.po
  M ckan/i18n/fi/LC_MESSAGES/ckan.po
  M ckan/i18n/fr/LC_MESSAGES/ckan.po
  M ckan/i18n/hu/LC_MESSAGES/ckan.po
  M ckan/i18n/it/LC_MESSAGES/ckan.po
  M ckan/i18n/lt/LC_MESSAGES/ckan.po
  M ckan/i18n/nl/LC_MESSAGES/ckan.po
  M ckan/i18n/no/LC_MESSAGES/ckan.po
  M ckan/i18n/pl/LC_MESSAGES/ckan.po
  M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
  M ckan/i18n/ro/LC_MESSAGES/ckan.po
  M ckan/i18n/ru/LC_MESSAGES/ckan.po
  M ckan/i18n/sl/LC_MESSAGES/ckan.po
  M ckan/i18n/sq/LC_MESSAGES/ckan.po
  M ckan/i18n/sr/LC_MESSAGES/ckan.po
  M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
  M ckan/i18n/sv/LC_MESSAGES/ckan.po
  M ckan/lib/app_globals.py
  M ckan/lib/cli.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/dictization/model_save.py
  A ckan/lib/repoze_patch.py
  M ckan/lib/search/query.py
  M ckan/logic/action/get.py
  M ckan/logic/action/update.py
  M ckan/model/authz.py
  M ckan/model/package.py
  M ckan/plugins/interfaces.py
  R ckan/public/images/ckan-features.png
  A ckan/public/images/icons/ckan.ico
  M ckan/templates/home/about.html
  M ckan/templates/layout_base.html
  M ckan/templates/package/edit.html
  M ckan/templates/package/layout.html
  M ckan/templates/package/search_form.html
  M ckan/templates/user/login.html
  M ckan/tests/functional/api/model/test_package.py
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/api/test_package_search.py
  M ckan/tests/functional/test_cors.py
  M ckan/tests/functional/test_home.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_pagination.py
  M ckan/tests/functional/test_user.py
  A ckan/tests/lib/test_cli.py
  M ckan/tests/lib/test_dictization.py
  M ckan_deb/usr/bin/ckan-create-instance
  M ckan_deb/usr/bin/ckan-setup-solr
  M ckan_deb/usr/lib/ckan/common.sh
  M doc/common-error-messages.rst
  M doc/configuration.rst
  M doc/extensions.rst
  M doc/install-from-package.rst
  M doc/loading_data.rst
  M doc/solr-setup.rst
  M doc/test.rst
  R doc/upgrade.rst
  M pip-requirements-test.txt

  Log Message:
  -----------
  Merge branch 'master' into feature-1608-move-storage-to-core