[ckan-changes] [ckan/ckan] 5f065b: [#3929] Try a compromise between other options.

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 5f065b0b752606a53a5b85805af7b8c1ba954718
      https://github.com/ckan/ckan/commit/5f065b0b752606a53a5b85805af7b8c1ba954718
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2018-02-16 (Fri, 16 Feb 2018)

  Changed paths:
    M ckan/migration/versions/001_add_existing_tables.py

  Log Message:
  -----------
  [#3929] Try a compromise between other options.


  Commit: e6683a01f8e51d8d9eed848b8d11d5ca2c78618d
      https://github.com/ckan/ckan/commit/e6683a01f8e51d8d9eed848b8d11d5ca2c78618d
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2018-02-16 (Fri, 16 Feb 2018)

  Changed paths:
    M ckan/migration/versions/001_add_existing_tables.py

  Log Message:
  -----------
  Merge pull request #4026 from ckan/3929-schema-compromise

State table clash - compromise option


Compare: https://github.com/ckan/ckan/compare/eda0b4929b5b...e6683a01f8e5