[Pytest-commit] [pytest-dev/pytest] 899460: Document hooks (defined with historic=True) which ...

[Bruno Oliveira]

  Branch: refs/heads/master
  Home:   https://github.com/pytest-dev/pytest
  Commit: 8994603d46d32abc50f50a8967ed042c764b2172
      https://github.com/pytest-dev/pytest/commit/8994603d46d32abc50f50a8967ed042c764b2172
  Author: Brian Maissy <brian.maissy at gmail.com>
  Date:   2018-01-21 (Sun, 21 Jan 2018)

  Changed paths:
    M _pytest/hookspec.py
    A changelog/2423.doc

  Log Message:
  -----------
  Document hooks (defined with historic=True) which cannot be used with hookwrapper=True


  Commit: 8a8797df8034fb37ced96406429fe6f1b28bbf1b
      https://github.com/pytest-dev/pytest/commit/8a8797df8034fb37ced96406429fe6f1b28bbf1b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-01-21 (Sun, 21 Jan 2018)

  Changed paths:
    M changelog/2423.doc

  Log Message:
  -----------
  Small changelog formatting


  Commit: 060f68bd901904489b5dcf10367370224831f83b
      https://github.com/pytest-dev/pytest/commit/060f68bd901904489b5dcf10367370224831f83b
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-01-22 (Mon, 22 Jan 2018)

  Changed paths:
    M _pytest/hookspec.py
    A changelog/2423.doc

  Log Message:
  -----------
  Merge pull request #3137 from brianmaissy/doc/note_that_certain_hooks_cant_be_used_with_hookwrapper

Document hooks (defined with historic=True) which cannot be used with hookwrapper=True


Compare: https://github.com/pytest-dev/pytest/compare/e5739a311515...060f68bd9019