[Checkins] [zopefoundation/zc.queue] c7dbfe: Merge andrew-conflict-resolution-persistent branch...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zopefoundation/zc.queue
  Commit: c7dbfee49bf3d5248bd40d4e30feffe912e844e0
      https://github.com/zopefoundation/zc.queue/commit/c7dbfee49bf3d5248bd40d4e30feffe912e844e0
  Author: Andrew Sung <asung at zope.com>
  Date:   2012-01-11 (Wed, 11 Jan 2012)

  Changed paths:
    M src/zc/queue/_queue.py
    M src/zc/queue/queue.txt
    M src/zc/queue/tests.py

  Log Message:
  -----------
  Merge andrew-conflict-resolution-persistent branch back to trunk

svn merge -r123976:HEAD svn+ssh://svn.zope.org/repos/main/zc.queue/branches/andrew-conflict-resolution-persistent


  Commit: 707f1fe0796bbec16d85d82fce8ac1de59b563d2
      https://github.com/zopefoundation/zc.queue/commit/707f1fe0796bbec16d85d82fce8ac1de59b563d2
  Author: Andrew Sung <asung at zope.com>
  Date:   2012-01-11 (Wed, 11 Jan 2012)

  Changed paths:
    M CHANGES.txt

  Log Message:
  -----------
  prepare for release
 - update change log


  Commit: 13b860fd2bb4511d98231689c2686f9e9704e70b
      https://github.com/zopefoundation/zc.queue/commit/13b860fd2bb4511d98231689c2686f9e9704e70b
  Author: Andrew Sung <asung at zope.com>
  Date:   2012-01-11 (Wed, 11 Jan 2012)

  Changed paths:
    M CHANGES.txt
    M setup.py

  Log Message:
  -----------
  bump dev version


  Commit: ace0b71178face571ca37bb02f10dacaddcf05e0
      https://github.com/zopefoundation/zc.queue/commit/ace0b71178face571ca37bb02f10dacaddcf05e0
  Author: Maurits van Rees <maurits at vanrees.org>
  Date:   2012-01-19 (Thu, 19 Jan 2012)

  Changed paths:
    M CHANGES.txt
    M setup.py

  Log Message:
  -----------
  Note that due to syntax we require Python 2.5 or higher now.


  Commit: 07bde9929d535a5b55faeae7bc1848e6411cd59c
      https://github.com/zopefoundation/zc.queue/commit/07bde9929d535a5b55faeae7bc1848e6411cd59c
  Author: Malthe Borch <mborch at gmail.com>
  Date:   2012-06-25 (Mon, 25 Jun 2012)

  Changed paths:
    M CHANGES.txt
    M src/zc/queue/_queue.py

  Log Message:
  -----------
  Fixed programming error that would prevent slicing of composite queues.


Compare: https://github.com/zopefoundation/zc.queue/compare/c7dbfee49bf3^...07bde9929d53