[ckan-changes] [okfn/ckan] 531063: Merge branch 'master' of https://github.com/okfn/c...

[GitHub]

  Branch: refs/heads/2670-get-children-groups-defect
  Home:   https://github.com/okfn/ckan
  Commit: 5310639f20dd369caa4f809f54a536856528822e
      https://github.com/okfn/ckan/commit/5310639f20dd369caa4f809f54a536856528822e
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-07-16 (Mon, 16 Jul 2012)

  Changed paths:
    M ckan/lib/helpers.py

  Log Message:
  -----------
  Merge branch 'master' of https://github.com/okfn/ckan


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

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

  Log Message:
  -----------
  Update to fix the group.get_children_groups call which was returning
deleted items.


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

  Changed paths:
    M ckan/model/group.py

  Log Message:
  -----------
  PEP8


Compare: https://github.com/okfn/ckan/compare/5310639f20dd^...46c514ea18ef