Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #11198 from stanley-cheung/upmerge-v1_3_2-to-master | Stanley Cheung | 2017-05-18 |
|\ | | | | | Upmerge v1.3.x branch to master | ||
* \ | Merge pull request #11174 from stanley-cheung/php-fix-c-ext-version | Stanley Cheung | 2017-05-17 |
|\ \ | | | | | | | PHP: fix pecl extension version | ||
| | * | Upmerge from v1.3.x branch to master | Stanley Cheung | 2017-05-17 |
| |/| |/| | | |||
* | | | PHP: fix pecl extension after cc files are added | Stanley Cheung | 2017-05-17 |
| | | | |||
| * | | PHP: fix pecl extension reported version | Stanley Cheung | 2017-05-17 |
|/ / | |||
* | | PHP: stop requiring google/protobuf PHP implementation | Stanley Cheung | 2017-05-16 |
| | | |||
* | | Merge pull request #11115 from jtattermusch/revamp_artifacts | Jan Tattermusch | 2017-05-15 |
|\ \ | | | | | | | Revamp artifacts, packages and distribtests | ||
| * | | adjust package build scripts to new paths | Jan Tattermusch | 2017-05-12 |
| | | | |||
* | | | upgrade C# to protobuf 3.3.0 | Jan Tattermusch | 2017-05-12 |
|/ / | |||
* | | fix protoc x86 windows artifact build | Jan Tattermusch | 2017-05-12 |
| | | |||
* | | Stop checking for pre-c++11 compilers since these are no longer | Vijay Pai | 2017-05-10 |
| | | | | | | | | supported | ||
* | | Remove gcc-4.4 and 4.6 from portability tests since core now accepts C++11. | Vijay Pai | 2017-05-10 |
| | | |||
| * | PHP: fixed some memory leaks | Stanley Cheung | 2017-05-09 |
| | | |||
* | | Merge pull request #10967 from matt-kwong/upload_results2 | Matt Kwong | 2017-05-09 |
|\ \ | | | | | | | Add option to upload Jenkins test result to BQ | ||
* \ \ | Merge pull request #10995 from kpayson64/upgrade_protobuf | kpayson64 | 2017-05-09 |
|\ \ \ | | | | | | | | | Upgrade protobuf to 3.3.0 | ||
* \ \ \ | Merge pull request #11027 from yongni/stress_cleanup | yongni | 2017-05-09 |
|\ \ \ \ | | | | | | | | | | | Removed the dockerfiles and test driver for stress test | ||
* | | | | | Added go 1.7 and 1.8 template and Dockerfile(s) for go/grpc-matrix test setup. | Yong Ni | 2017-05-08 |
| | | | | | |||
| * | | | | Removed the dockerfiles and test driver for stress test | Yong Ni | 2017-05-08 |
|/ / / / | |||
| | * / | Add option to upload Jenkins test result to BQ | Matt Kwong | 2017-05-08 |
| |/ / |/| | | |||
| * | | Upgrade protobuf to 3.3.0 | Ken Payson | 2017-05-08 |
|/ / | |||
| * | Merge pull request #10954 from stanley-cheung/php-release-1_3-disable-cares | Stanley Cheung | 2017-05-03 |
| |\ | | | | | | | PHP: disable cares for release 1.3 | ||
| * | | Switch Protobuf.js dependency back to version 5 | murgatroid99 | 2017-05-02 |
| | | | |||
| | * | PHP: release 1.3, disable cares deps | Stanley Cheung | 2017-05-02 |
| |/ | |||
* | | Merge commit '3049460b75ac557348243601896ed68ca8145522' into ↵ | David Garcia Quintas | 2017-04-28 |
|\ \ | | | | | | | | | | master-upmerge-v1.3.x | ||
* \ \ | Merge branch 'v1.3.x' into master-upmerge-v1.3.x | David Garcia Quintas | 2017-04-28 |
|\ \ \ | |||
| | | * | include sources and symbols in C# nugets | Jan Tattermusch | 2017-04-28 |
| | | | | |||
| | | * | Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uv | murgatroid99 | 2017-04-26 |
| | |/| | |||
| | | * | Revert "Merge branch 'master' into v1.3.x" | Alexander Polcyn | 2017-04-26 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 79759fea1abd09102d38af3e13a84b69e898124b, reversing changes made to dc36f4df6aba60275a31227e1d29c4d20b6cadca. | ||
* | | | | Fix for recent cmake failure owing to gmock | Mahak Mukhi | 2017-04-26 |
| | | | | |||
| | * | | Merge remote-tracking branch 'upstream/v1.3.x' into node_only_uv | murgatroid99 | 2017-04-25 |
| | |\| | |||
| | | * | Merge branch 'master' into v1.3.x | Yuchen Zeng | 2017-04-25 |
| | |/| | |/|/ | |/| |/| | | |||
* | | | Merge pull request #10644 from MakMukhi/master | MakMukhi | 2017-04-24 |
|\ \ \ | | | | | | | | | Added unit testing support. | ||
| | | * | Remove non-libuv code from Node extension | murgatroid99 | 2017-04-24 |
| | |/ | |||
* | | | Increase portability of CMakeLists.txt | Mehrdad Afshari | 2017-04-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update CMakeLists.txt (original template and generated code) to prevent forcefully linking `dl` on all UNIX platforms, and rely on `${CMAKE_DL_LIBS}` portable variable instead. - Do not try linking against `librt` on macOS. - Add a `config_freebsd` directory containing the header file generated by the `configure` script for the `ares` library. | ||
| | * | Merge pull request #10737 from murgatroid99/node_artifact_alpine_compatibility | Michael Lumish | 2017-04-20 |
| | |\ | | | | | | | | | Add flag to compile gpr with compatibility for musl | ||
* | | \ | Merge remote-tracking branch 'upstream/v1.3.x' into upmerge_v1.3.x | murgatroid99 | 2017-04-19 |
|\ \ \ \ | |||
| | | * | | Node: fix the cases where zlib is built | murgatroid99 | 2017-04-19 |
| | | | | | |||
| | | * | | Node: Don't depend on cares npm package | murgatroid99 | 2017-04-19 |
| | |/ / | |/| | | |||
| | | * | Add flag to compile gpr with compatibility for musl | murgatroid99 | 2017-04-19 |
| | |/ | |/| | |||
| | * | Tab/space problem with Makefile.template | Mahak Mukhi | 2017-04-18 |
| | | | |||
| | * | Readding the line mistakenly deleted. | Mahak Mukhi | 2017-04-18 |
| | | | |||
| | * | trial and error | Mahak Mukhi | 2017-04-18 |
| | | | |||
| | * | discovered generate_projects.sh script! | Mahak Mukhi | 2017-04-18 |
| | | | |||
* | | | Keep _grpcio_metadata.py in GitHub repo | Matt Kwong | 2017-04-18 |
| | | | |||
| * | | Merge pull request #10669 from stanley-cheung/php-add-ares-deps | Stanley Cheung | 2017-04-18 |
| |\ \ | | | | | | | | | PHP: add ares as deps | ||
| | * | | PHP: add ares as deps | Stanley Cheung | 2017-04-14 |
| |/ / |/| | | |||
| * | | Build for more versions of electron, restrict when a Windows warning is shown | murgatroid99 | 2017-04-13 |
|/ / | |||
* | | Merge remote-tracking branch 'upstream/v1.2.x' into upmerge_1.2.4 | murgatroid99 | 2017-04-13 |
|\ \ | |/ |/| | |||
* | | Fix BUILD dependency, copyright and cmake | yang-g | 2017-04-12 |
| | | |||
| * | Merge pull request #10303 from murgatroid99/makefile_soname_fix | Michael Lumish | 2017-04-12 |
| |\ | | | | | | | Fix soname version mismatch in Makefile |