[ckan-changes] [ckan/ckan] 07879a: fix failing test on dev-2.8 build

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 07879a73171598128aeac788ebee1a5e93315cb7
      https://github.com/ckan/ckan/commit/07879a73171598128aeac788ebee1a5e93315cb7
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M ckan/tests/test_none_root.py

  Log Message:
  -----------
  fix failing test on dev-2.8 build


  Commit: c893d541faa478f950dd240a6a392a548913a346
      https://github.com/ckan/ckan/commit/c893d541faa478f950dd240a6a392a548913a346
  Author: Konstantin Sivakov <konstantin.sivakov at gmail.com>
  Date:   2018-04-20 (Fri, 20 Apr 2018)

  Changed paths:
    M Dockerfile

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into fix-dev-v2.8-none-root-test


  Commit: 5634fd1724824dd1785ab901095acb27baa3448f
      https://github.com/ckan/ckan/commit/5634fd1724824dd1785ab901095acb27baa3448f
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2018-04-23 (Mon, 23 Apr 2018)

  Changed paths:
    M ckan/tests/test_none_root.py

  Log Message:
  -----------
  Merge pull request #4199 from tino097/fix-dev-v2.8-none-root-test

fix failing test on dev-2.8 build


Compare: https://github.com/ckan/ckan/compare/62093da6905b...5634fd172482