diff options
author | Paul Yang <TeBoring@users.noreply.github.com> | 2018-04-02 15:55:28 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-02 15:55:28 -0700 |
commit | c93174346149f259ebc85fdb46826fcf84abb07d (patch) | |
tree | 284fd957f2007db39101adb0d51ca0fb0b007255 /php | |
parent | 579f81e1c66d64395031a1bbcb54ba7a44dade55 (diff) | |
download | protobuf-c93174346149f259ebc85fdb46826fcf84abb07d.tar.gz protobuf-c93174346149f259ebc85fdb46826fcf84abb07d.tar.bz2 protobuf-c93174346149f259ebc85fdb46826fcf84abb07d.zip |
Merge branch (#4466)
* Fix setup.py for windows build.
* Bump version number to 3.5.2
* Cat the test-suite.log on errors for presubits
Diffstat (limited to 'php')
-rw-r--r-- | php/ext/google/protobuf/package.xml | 22 | ||||
-rw-r--r-- | php/ext/google/protobuf/protobuf.h | 2 |
2 files changed, 20 insertions, 4 deletions
diff --git a/php/ext/google/protobuf/package.xml b/php/ext/google/protobuf/package.xml index 626eb46b..3a556acf 100644 --- a/php/ext/google/protobuf/package.xml +++ b/php/ext/google/protobuf/package.xml @@ -10,11 +10,11 @@ <email>protobuf-opensource@google.com</email> <active>yes</active> </lead> - <date>2017-12-11</date> + <date>2018-03-06</date> <time>11:02:07</time> <version> - <release>3.5.1</release> - <api>3.5.1</api> + <release>3.5.2</release> + <api>3.5.2</api> </version> <stability> <release>stable</release> @@ -216,5 +216,21 @@ GA release. GA release. </notes> </release> + <release> + <version> + <release>3.5.2</release> + <api>3.5.2</api> + </version> + <stability> + <release>stable</release> + <api>stable</api> + </stability> + <date>2018-03-06</date> + <time>11:02:07</time> + <license uri="https://opensource.org/licenses/BSD-3-Clause">3-Clause BSD License</license> + <notes> +G A release. + </notes> + </release> </changelog> </package> diff --git a/php/ext/google/protobuf/protobuf.h b/php/ext/google/protobuf/protobuf.h index be1de5cf..c15bde2d 100644 --- a/php/ext/google/protobuf/protobuf.h +++ b/php/ext/google/protobuf/protobuf.h @@ -37,7 +37,7 @@ #include "upb.h" #define PHP_PROTOBUF_EXTNAME "protobuf" -#define PHP_PROTOBUF_VERSION "3.5.1" +#define PHP_PROTOBUF_VERSION "3.5.2" #define MAX_LENGTH_OF_INT64 20 #define SIZEOF_INT64 8 |