[ckan-changes] [okfn/ckan] 2983d2: [xs] Small fix to the storage test

[GitHub]

  Branch: refs/heads/feature-1515-activity-streams
  Home:   https://github.com/okfn/ckan
  Commit: 2983d249b46b3bb9beec89fab23710827b9dd4a7
      https://github.com/okfn/ckan/commit/2983d249b46b3bb9beec89fab23710827b9dd4a7
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    M ckan/tests/functional/test_storage.py

  Log Message:
  -----------
  [xs] Small fix to the storage test


  Commit: 7bcadaf1761466fcb1ecf2d59e22ddb807dff37e
      https://github.com/okfn/ckan/commit/7bcadaf1761466fcb1ecf2d59e22ddb807dff37e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    M ckan/controllers/storage.py
  M ckan/tests/functional/test_storage.py
  M doc/configuration.rst
  M doc/file-upload.rst

  Log Message:
  -----------
  [1690] Fixed the naming of the storage settings


  Commit: 88c239e1817b7db42de2e92ce047ce1f6a79b132
      https://github.com/okfn/ckan/commit/88c239e1817b7db42de2e92ce047ce1f6a79b132
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    M ckan/config/routing.py
  M ckan/controllers/group.py
  M ckan/controllers/package.py
  M ckan/controllers/storage.py
  M ckan/lib/dictization/model_dictize.py
  M ckan/lib/helpers.py
  M ckan/logic/schema.py
  M ckan/migration/versions/047_rename_package_group_member.py
  M ckan/model/package.py
  M ckan/plugins/interfaces.py
  M ckan/templates/group/layout.html
  M ckan/tests/functional/api/test_action.py
  M ckan/tests/functional/test_group.py
  M ckan/tests/functional/test_package.py
  M ckan/tests/functional/test_storage.py
  M ckan/tests/lib/test_dictization.py
  M ckan/tests/lib/test_dictization_schema.py
  M doc/configuration.rst
  M doc/file-upload.rst

  Log Message:
  -----------
  Merge from master


Compare: https://github.com/okfn/ckan/compare/f76b97f...88c239e