[pypy-commit] pypy release-pypy2.7-6.x: merge default into release

2018-04-20 Thread mattip
Author: Matti Picus Branch: release-pypy2.7-6.x Changeset: r94392:0f99a0bed290 Date: 2018-04-20 14:20 +0300 http://bitbucket.org/pypy/pypy/changeset/0f99a0bed290/ Log:merge default into release diff too long, truncating to 2000 out of 4130 lines diff --git a/pypy/doc/gc_info.rst b/pypy/doc/

[pypy-commit] pypy release-pypy2.7-6.x: merge default into release

2018-04-14 Thread mattip
Author: Matti Picus Branch: release-pypy2.7-6.x Changeset: r94323:46a3d2b1b0ee Date: 2018-04-14 20:45 +0300 http://bitbucket.org/pypy/pypy/changeset/46a3d2b1b0ee/ Log:merge default into release diff --git a/lib-python/2.7/test/test_eof.py b/lib-python/2.7/test/test_eof.py --- a/lib-python/2.

[pypy-commit] pypy release-pypy2.7-6.x: merge default into release

2018-04-05 Thread mattip
Author: Matti Picus Branch: release-pypy2.7-6.x Changeset: r94246:cda3e08c8c81 Date: 2018-04-05 13:54 +0300 http://bitbucket.org/pypy/pypy/changeset/cda3e08c8c81/ Log:merge default into release diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -6,36 +6,36 @@ Except when otherwis