[Pytest-commit] [pytest-dev/pytest] 51abdb: Merge pull request #3278 from nicoddemus/revert-mo...

[Bruno Oliveira]

  Branch: refs/heads/features
  Home:   https://github.com/pytest-dev/pytest
  Commit: 51abdb80db6927a1373b49ee44fa8f31c560b28d
      https://github.com/pytest-dev/pytest/commit/51abdb80db6927a1373b49ee44fa8f31c560b28d
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M _pytest/python_api.py
    R changelog/3265.trivial.rst
    M setup.py

  Log Message:
  -----------
  Merge pull request #3278 from nicoddemus/revert-more_itertools-master

Revert introduction of more_itertools on master


  Commit: fac8208e8f13a94299670d91b2e981e4b2ba35c5
      https://github.com/pytest-dev/pytest/commit/fac8208e8f13a94299670d91b2e981e4b2ba35c5
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-04 (Sun, 04 Mar 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3203.bugfix.rst
    R changelog/3209.doc.rst
    R changelog/3241.bugfix.rst
    R changelog/3247.bugfix.rst
    R changelog/3249.bugfix.rst
    R changelog/3259.trivial
    R changelog/3260.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.4.2.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Preparing release version 3.4.2


  Commit: e8368e6c2ea101a79b877509622878ab7b12d1bd
      https://github.com/pytest-dev/pytest/commit/e8368e6c2ea101a79b877509622878ab7b12d1bd
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Fix duplicated link in CHANGELOG


  Commit: 27c4de242f6524cfda73766e4d09b0b7cbad4183
      https://github.com/pytest-dev/pytest/commit/27c4de242f6524cfda73766e4d09b0b7cbad4183
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3203.bugfix.rst
    R changelog/3209.doc.rst
    R changelog/3241.bugfix.rst
    R changelog/3247.bugfix.rst
    R changelog/3249.bugfix.rst
    R changelog/3259.trivial
    R changelog/3260.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.4.2.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Merge pull request #3281 from nicoddemus/release-3.4.2

Preparing release version 3.4.2


  Commit: ade7ad25c77b2041865a10bd53f6b507a2dfb705
      https://github.com/pytest-dev/pytest/commit/ade7ad25c77b2041865a10bd53f6b507a2dfb705
  Author: Bruno Oliveira <nicoddemus at gmail.com>
  Date:   2018-03-05 (Mon, 05 Mar 2018)

  Changed paths:
    M CHANGELOG.rst
    R changelog/3203.bugfix.rst
    R changelog/3209.doc.rst
    R changelog/3241.bugfix.rst
    R changelog/3247.bugfix.rst
    R changelog/3249.bugfix.rst
    R changelog/3259.trivial
    R changelog/3260.bugfix.rst
    M doc/en/announce/index.rst
    A doc/en/announce/release-3.4.2.rst
    M doc/en/example/reportingdemo.rst

  Log Message:
  -----------
  Merge remote-tracking branch 'upstream/master' into features


Compare: https://github.com/pytest-dev/pytest/compare/9879ac5911c0...ade7ad25c77b