[ckan-changes] [okfn/ckan] e4fec4: Fix exception when querying and a SolrException oc...

[GitHub]

  Branch: refs/heads/defects-from-dgu
  Home:   https://github.com/okfn/ckan
  Commit: e4fec4ce1dd8eb2abd25c9235a29ff33cb825be6
      https://github.com/okfn/ckan/commit/e4fec4ce1dd8eb2abd25c9235a29ff33cb825be6
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/lib/search/query.py

  Log Message:
  -----------
  Fix exception when querying and a SolrException occurs, due to not importing it in correct place.


  Commit: cd10dc43c4b26637e514aabfc4802f8dd75c5640
      https://github.com/okfn/ckan/commit/cd10dc43c4b26637e514aabfc4802f8dd75c5640
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/lib/cli.py
    M ckan/tests/models/test_user.py

  Log Message:
  -----------
  Add cli param to allow options to be passed to celery daemon (e.g. concurrency limit).


  Commit: 08f14618fa4b06597e3bb6cd1b2746d532e2e6c8
      https://github.com/okfn/ckan/commit/08f14618fa4b06597e3bb6cd1b2746d532e2e6c8
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/controllers/package.py

  Log Message:
  -----------
  Merge conflict


  Commit: c69b08ae548aa957c898db54dd1bd9ed4bfe41e9
      https://github.com/okfn/ckan/commit/c69b08ae548aa957c898db54dd1bd9ed4bfe41e9
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/controllers/revision.py

  Log Message:
  -----------
  Cope with bad revisions being created. To find the problem at source too, but in the mean-time cope.


  Commit: 4009298f680ece66a5d8c6f784a35e63cc11d1ab
      https://github.com/okfn/ckan/commit/4009298f680ece66a5d8c6f784a35e63cc11d1ab
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/lib/dictization/model_save.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py
    M ckan/new_authz.py

  Log Message:
  -----------
  Merge conflicts with cherry-pick


  Commit: 5644ddd24b2d5d9a170a518a7b9cac2915d419d5
      https://github.com/okfn/ckan/commit/5644ddd24b2d5d9a170a518a7b9cac2915d419d5
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/lib/navl/dictization_functions.py
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Changed debug to show post validation version of the data - more useful.


  Commit: 9568c7794957b40021eb8636b47f06c0094b1586
      https://github.com/okfn/ckan/commit/9568c7794957b40021eb8636b47f06c0094b1586
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/lib/cli.py

  Log Message:
  -----------
  Added some useful feedback from these CLI functions.


  Commit: 3c313968a098413bcf7c92f848693a4149b5280f
      https://github.com/okfn/ckan/commit/3c313968a098413bcf7c92f848693a4149b5280f
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/tests/functional/test_group.py

  Log Message:
  -----------
  Merge conflict


  Commit: 0ec482d2b41e30f91ed136d0ef48c797e746d260
      https://github.com/okfn/ckan/commit/0ec482d2b41e30f91ed136d0ef48c797e746d260
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/logic/auth/publisher/get.py
    M ckan/tests/functional/test_publisher_auth.py

  Log Message:
  -----------
  [#2668] Sysadmin gets permission to view a deleted publisher.


  Commit: 70dfc9f7fc0a70a525551659034b9eb8959f547a
      https://github.com/okfn/ckan/commit/70dfc9f7fc0a70a525551659034b9eb8959f547a
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/logic/action/update.py

  Log Message:
  -----------
  Fixes from broken merge


Compare: https://github.com/okfn/ckan/compare/e4fec4ce1dd8^...70dfc9f7fc0a