[ckan-changes] [ckan/ckan] 1808a8: fix paster db clean again

Wed May 21 11:30:25 UTC 2014

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 1808a81182e987923000b369f7e74b1ab7194d8c
      https://github.com/ckan/ckan/commit/1808a81182e987923000b369f7e74b1ab7194d8c
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  fix paster db clean again

User.get() leaves an open transaction when the site user is added to the
pylons context, commit here closes it so it does not lock tables when
running paster db clean


  Commit: f31a1924bc8539ab73260771b31cd5174b19b1f9
      https://github.com/ckan/ckan/commit/f31a1924bc8539ab73260771b31cd5174b19b1f9
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  fix paster db clean

defer commit from get_site_user and attach it to pylons context first


  Commit: 7f0e59e05257e935b0a83d0bce50c0a05f8a8170
      https://github.com/ckan/ckan/commit/7f0e59e05257e935b0a83d0bce50c0a05f8a8170
  Author: joetsoi <joe.yeung.tsoi at gmail.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M ckan/logic/action/get.py

  Log Message:
  -----------
  [#1656] add doc string about defer_commit to get_site_user


  Commit: f7e9b6927a4dd1a1f1aed6acacc52e564fbc2a1a
      https://github.com/ckan/ckan/commit/f7e9b6927a4dd1a1f1aed6acacc52e564fbc2a1a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M README.rst
    M ckan/config/middleware.py
    M ckan/lib/dictization/model_save.py
    M ckan/lib/helpers.py
    M ckan/logic/__init__.py
    M ckan/logic/action/create.py
    M ckan/logic/action/get.py
    M ckan/logic/action/update.py
    M ckan/logic/schema.py
    M ckan/logic/validators.py
    M ckan/new_authz.py
    M ckan/new_tests/factories.py
    M ckan/new_tests/logic/action/test_create.py
    M ckan/new_tests/logic/test_validators.py
    A ckan/new_tests/test_factories.py
    M ckan/plugins/interfaces.py
    M ckan/public/base/javascript/modules/custom-fields.js
    M ckan/public/base/javascript/modules/image-upload.js
    M ckan/public/base/less/forms.less
    M ckan/public/base/less/layout.less
    M ckan/public/base/less/media.less
    M ckan/public/base/less/mixins.less
    A ckan/public/base/vendor/select2/.gitignore
    A ckan/public/base/vendor/select2/LICENSE
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/bower.json
    A ckan/public/base/vendor/select2/component.json
    A ckan/public/base/vendor/select2/composer.json
    A ckan/public/base/vendor/select2/package.json
    A ckan/public/base/vendor/select2/release.sh
    A ckan/public/base/vendor/select2/select2-bootstrap.css
    M ckan/public/base/vendor/select2/select2.css
    A ckan/public/base/vendor/select2/select2.jquery.json
    M ckan/public/base/vendor/select2/select2.js
    M ckan/public/base/vendor/select2/select2.min.js
    A ckan/public/base/vendor/select2/select2_locale_ar.js
    A ckan/public/base/vendor/select2/select2_locale_bg.js
    A ckan/public/base/vendor/select2/select2_locale_ca.js
    A ckan/public/base/vendor/select2/select2_locale_cs.js
    A ckan/public/base/vendor/select2/select2_locale_da.js
    A ckan/public/base/vendor/select2/select2_locale_de.js
    A ckan/public/base/vendor/select2/select2_locale_el.js
    A ckan/public/base/vendor/select2/select2_locale_en.js.template
    A ckan/public/base/vendor/select2/select2_locale_es.js
    A ckan/public/base/vendor/select2/select2_locale_et.js
    A ckan/public/base/vendor/select2/select2_locale_eu.js
    A ckan/public/base/vendor/select2/select2_locale_fa.js
    A ckan/public/base/vendor/select2/select2_locale_fi.js
    A ckan/public/base/vendor/select2/select2_locale_fr.js
    A ckan/public/base/vendor/select2/select2_locale_gl.js
    A ckan/public/base/vendor/select2/select2_locale_he.js
    A ckan/public/base/vendor/select2/select2_locale_hr.js
    A ckan/public/base/vendor/select2/select2_locale_hu.js
    A ckan/public/base/vendor/select2/select2_locale_id.js
    A ckan/public/base/vendor/select2/select2_locale_is.js
    A ckan/public/base/vendor/select2/select2_locale_it.js
    A ckan/public/base/vendor/select2/select2_locale_ja.js
    A ckan/public/base/vendor/select2/select2_locale_ka.js
    A ckan/public/base/vendor/select2/select2_locale_ko.js
    A ckan/public/base/vendor/select2/select2_locale_lt.js
    A ckan/public/base/vendor/select2/select2_locale_lv.js
    A ckan/public/base/vendor/select2/select2_locale_mk.js
    A ckan/public/base/vendor/select2/select2_locale_ms.js
    A ckan/public/base/vendor/select2/select2_locale_nl.js
    A ckan/public/base/vendor/select2/select2_locale_no.js
    A ckan/public/base/vendor/select2/select2_locale_pl.js
    A ckan/public/base/vendor/select2/select2_locale_pt-BR.js
    A ckan/public/base/vendor/select2/select2_locale_pt-PT.js
    A ckan/public/base/vendor/select2/select2_locale_ro.js
    A ckan/public/base/vendor/select2/select2_locale_rs.js
    A ckan/public/base/vendor/select2/select2_locale_ru.js
    A ckan/public/base/vendor/select2/select2_locale_sk.js
    A ckan/public/base/vendor/select2/select2_locale_sv.js
    A ckan/public/base/vendor/select2/select2_locale_th.js
    A ckan/public/base/vendor/select2/select2_locale_tr.js
    A ckan/public/base/vendor/select2/select2_locale_uk.js
    A ckan/public/base/vendor/select2/select2_locale_vi.js
    A ckan/public/base/vendor/select2/select2_locale_zh-CN.js
    A ckan/public/base/vendor/select2/select2_locale_zh-TW.js
    M ckan/templates/footer.html
    M ckan/templates/home/snippets/search.html
    M ckan/templates/macros/form.html
    M ckan/templates/package/read_base.html
    M ckan/templates/snippets/license.html
    M ckan/templates/user/snippets/recaptcha.html
    M ckanext/resourceproxy/controller.py
    M ckanext/resourceproxy/tests/test_proxy.py
    M ckanext/stats/__init__.py
    M doc/contributing/pull-requests.rst
    M doc/contributing/test.rst
    M doc/contributing/testing.rst
    M doc/images/add_dataset_3.jpg
    M doc/maintaining/installing/deployment.rst
    M doc/user-guide.rst

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/ckan/ckan into 1656-fix-paster-db-clean


  Commit: 12744924e254e52a5722e89a4d495a612f282c4a
      https://github.com/ckan/ckan/commit/12744924e254e52a5722e89a4d495a612f282c4a
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-05-21 (Wed, 21 May 2014)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/logic/action/get.py

  Log Message:
  -----------
  Merge branch '1656-fix-paster-db-clean'


Compare: https://github.com/ckan/ckan/compare/15a71ab82308...12744924e254