[ckan-changes] [ckan/ckan] 7ed2d0: Update CHANGELOG ahead of 2.5.4

[GitHub]

  Branch: refs/heads/release-v2.5.4
  Home:   https://github.com/ckan/ckan
  Commit: 7ed2d0ddd9b3dfe6597db28b80d6422bc0418069
      https://github.com/ckan/ckan/commit/7ed2d0ddd9b3dfe6597db28b80d6422bc0418069
  Author: amercader <amercadero at gmail.com>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update CHANGELOG ahead of 2.5.4


  Commit: 8abbb3b4be6aef95b253d69f625f833f3a9713b7
      https://github.com/ckan/ckan/commit/8abbb3b4be6aef95b253d69f625f833f3a9713b7
  Author: amercader <amercadero at gmail.com>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  Update version number for 2.5.4


  Commit: 03664c851d0c6e13ab066553996954c969495c70
      https://github.com/ckan/ckan/commit/03664c851d0c6e13ab066553996954c969495c70
  Author: amercader <amercadero at gmail.com>
  Date:   2017-02-22 (Wed, 22 Feb 2017)

  Changed paths:
    M ckanext/datastore/logic/action.py

  Log Message:
  -----------
  Fix exception caused by bad merged on d70db78


Compare: https://github.com/ckan/ckan/compare/e766b676f4cb...03664c851d0c