diff options
| author | Benjamin Peterson <benjamin@python.org> | 2018-04-29 22:48:13 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2018-04-29 22:48:13 (GMT) |
| commit | 75c8df51ac6937a77901027fbf351b67ea04e04c (patch) | |
| tree | 4c5e471b3b50760649a486112e8990c116a80b61 | |
| parent | 0b3800d82aacfe277d6ab7acfa2fce625bd69045 (diff) | |
| parent | ca079a3ea30098aff3197c559a0e32d42dda6d84 (diff) | |
| download | cpython-75c8df51ac6937a77901027fbf351b67ea04e04c.zip cpython-75c8df51ac6937a77901027fbf351b67ea04e04c.tar.gz cpython-75c8df51ac6937a77901027fbf351b67ea04e04c.tar.bz2 | |
merge 2.7.15 release branch
| -rw-r--r-- | Include/patchlevel.h | 6 | ||||
| -rw-r--r-- | Misc/NEWS.d/2.7.15.rst (renamed from Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst) | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 396c47e..99e8370 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -23,11 +23,11 @@ #define PY_MAJOR_VERSION 2 #define PY_MINOR_VERSION 7 #define PY_MICRO_VERSION 15 -#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA -#define PY_RELEASE_SERIAL 1 +#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL +#define PY_RELEASE_SERIAL 0 /* Version as a string */ -#define PY_VERSION "2.7.15rc1" +#define PY_VERSION "2.7.15" /*--end constants--*/ /* Subversion Revision number of this file (not of the repository). Empty diff --git a/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst b/Misc/NEWS.d/2.7.15.rst index 9ec1a60..52b99da 100644 --- a/Misc/NEWS.d/next/Core and Builtins/2018-04-29-12-07-00.bpo-33374.-xegL6.rst +++ b/Misc/NEWS.d/2.7.15.rst @@ -1,3 +1,9 @@ +.. bpo: 33374 +.. date: 2018-04-29-12-07-00 +.. nonce: -xegL6 +.. release date: 2018-04-29 +.. section: Core and Builtins + Tweak the definition of PyGC_Head, so compilers do not believe it is always 16-byte aligned on x86. This prevents crashes with more aggressive optimizations present in GCC 8. |