[ckan-changes] [ckan/ckan] 5193cc: fix datastore population failing on encoding

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 5193ccb55ea54f9b5d4b7b60e55ad48418962a80
      https://github.com/ckan/ckan/commit/5193ccb55ea54f9b5d4b7b60e55ad48418962a80
  Author: Denis Zgonjanin <deniszgonjanin at gmail.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  fix datastore population failing on encoding

Conflicts:
	ckanext/datastore/db.py


  Commit: 111ddfe7140bcf9d21739117b6cfdc44a6057e34
      https://github.com/ckan/ckan/commit/111ddfe7140bcf9d21739117b6cfdc44a6057e34
  Author: Ian Ward <ian at excess.org>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  Merge pull request #2182 from deniszgonjanin/datastore-encoding-error

datastore fails on non-ascii encodings


Compare: https://github.com/ckan/ckan/compare/7f62224ff405...111ddfe7140b