[ckan-changes] [ckan/ckan] 353948: Fix test for when "paster front-end-build" has bee...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 353948e7ebf45cc093f9a24986fe4734cfc28141
      https://github.com/ckan/ckan/commit/353948e7ebf45cc093f9a24986fe4734cfc28141
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M ckan/tests/controllers/test_admin.py

  Log Message:
  -----------
  Fix test for when "paster front-end-build" has been run, eg during release.


  Commit: e8c4af328224668ebe3ee825d6106d7f3ab0020e
      https://github.com/ckan/ckan/commit/e8c4af328224668ebe3ee825d6106d7f3ab0020e
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2015-12-17 (Thu, 17 Dec 2015)

  Changed paths:
    M CHANGELOG.rst
    M setup.py

  Log Message:
  -----------
  Change version to 2.5.1 because of problem reuploading to pypi.

Conflicts:

	ckan/__init__.py


Compare: https://github.com/ckan/ckan/compare/bcb78438898d...e8c4af328224