[ckan-changes] [okfn/ckan] 067431: [#2733] add 60 second query time out

[GitHub]

  Branch: refs/heads/2733-feature-datastore
  Home:   https://github.com/okfn/ckan
  Commit: 067431895f98496e6ad15a46357620bdbc7e9cde
      https://github.com/okfn/ckan/commit/067431895f98496e6ad15a46357620bdbc7e9cde
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M ckanext/datastore/db.py

  Log Message:
  -----------
  [#2733] add 60 second query time out


  Commit: 6e376d535b217c00c24e1fac83f327b7e2b2d840
      https://github.com/okfn/ckan/commit/6e376d535b217c00c24e1fac83f327b7e2b2d840
  Author: kindly <kindly at gmail.com>
  Date:   2012-08-20 (Mon, 20 Aug 2012)

  Changed paths:
    M ckan/config/environment.py
    M ckan/lib/search/__init__.py
    M ckan/lib/search/sql.py
    M ckan/tests/lib/test_simple_search.py
    M doc/datastore.rst

  Log Message:
  -----------
  Merge branch '2733-feature-datastore' of github.com:okfn/ckan into 2733-feature-datastore


Compare: https://github.com/okfn/ckan/compare/b6a4be56a11b...6e376d535b21