Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #11412 from kpayson64/upgrade_boringssl | kpayson64 | 2017-06-20 |
|\ | | | | | Upgrade boringssl | ||
* \ | Merge pull request #11516 from murgatroid99/upmerge_1.4.x | Michael Lumish | 2017-06-19 |
|\ \ | | | | | | | Upmerge 1.4.x into Master | ||
* \ \ | Merge pull request #11140 from randomguy3/cmake-install | Jan Tattermusch | 2017-06-19 |
|\ \ \ | | | | | | | | | Fix CMake installation issues | ||
* \ \ \ | Merge pull request #11469 from jtattermusch/cmake_explicit_protoc | Jan Tattermusch | 2017-06-19 |
|\ \ \ \ | | | | | | | | | | | Explicitly use built protoc for CMake build | ||
| | | * \ | Merge remote-tracking branch 'upstream/v1.4.x' into upmerge_1.4.x | murgatroid99 | 2017-06-15 |
| | | |\ \ | |||
| | | | | * | Update boringssl | Ken Payson | 2017-06-15 |
| | | | |/ | | | |/| | |||
* | | / | | cmake: add zlib and cares dep | Jan Tattermusch | 2017-06-13 |
| |_|/ / |/| | | | |||
| * | | | explicitly use built protoc for CMake build | Jan Tattermusch | 2017-06-13 |
|/ / / | |||
* | | | license fixes | Jan Tattermusch | 2017-06-08 |
| | | | |||
* | | | fix remaining license notices | Jan Tattermusch | 2017-06-08 |
| | | | |||
* | | | auto-fix most of licenses | Jan Tattermusch | 2017-06-08 |
| | | | |||
* | | | Merge pull request #11349 from yongni/matrix | yongni | 2017-06-07 |
|\ \ \ | | | | | | | | | Created a Java Oracle8 Dockerfile directory and moved build_inter… | ||
* \ \ \ | Merge pull request #11396 from matt-kwong/fix_csharp | Jan Tattermusch | 2017-06-06 |
|\ \ \ \ | | | | | | | | | | | Update Mono to Jessie for C# Dockerfiles | ||
| | | | * | Merge pull request #11264 from smulikHakipod/master | Michael Lumish | 2017-06-05 |
| | | | |\ | | | | | | | | | | | | | Compilation without ALPN support does not work | ||
* | | | | | | Check the version of system c-ares | Yuchen Zeng | 2017-06-02 |
| | | | | | | |||
| * | | | | | Update Mono to Jessie for C# Dockerfiles | Matt Kwong | 2017-06-02 |
|/ / / / / | |||
| | | * | | PHP: windows config.w32 fix | Stanley Cheung | 2017-06-01 |
| | | | | | |||
| * | | | | Create Dockerfile.include for java to be shared for java and java_oracle8. | Yong Ni | 2017-05-31 |
| | | | | | |||
| * | | | | Created a Java Oracle8 Dockerfile directory and moved all build_interop.sh ↵ | Yong Ni | 2017-05-31 |
|/ / / / | | | | | | | | | | | | | to under template/. Added java_oracle8 to the client matrix. | ||
| | * / | Add artifact builds for Node 8 | murgatroid99 | 2017-05-30 |
| |/ / |/| | | |||
* | | | Merge pull request #11309 from murgatroid99/master_1.3.x_upmerge | Michael Lumish | 2017-05-30 |
|\ \ \ | | | | | | | | | Master 1.3.x upmerge | ||
| * \ \ | Merge remote-tracking branch 'upstream/v1.3.x' into master_1.3.x_upmerge | murgatroid99 | 2017-05-25 |
| |\ \ \ | |||
* | | | | | improve CONTRIBUTING.md and add rules for PRs | Jan Tattermusch | 2017-05-25 |
|/ / / / | |||
| * | | | remove now unnecessary extra args | Jan Tattermusch | 2017-05-23 |
| | | | | |||
| | | * | update template | Yaron Shani | 2017-05-23 |
| | | | | |||
* | | | | PHP: Fixed bug in protoc plugin escaping comments | Stanley Cheung | 2017-05-22 |
| | | | | |||
* | | | | PHP: windows config.w32 file | Stanley Cheung | 2017-05-19 |
| |_|/ |/| | | |||
* | | | Merge matrix feature branch into master. | Yong Ni | 2017-05-19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Features included in this merge: - Added script to build and upload docker image for matrix test. - Added script to create test cases and created go__master testcases based on it. - Created dictionary for runtimes and gRPC releases for supported languages. - Added go 1.7 and 1.8 Dockerfile/templates. See tools/interop_matrix/README.md for details. | ||
* | | | 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 |
| | | | |||
| | * | Set gRPC_INSTALL to ON by default for MSVC and OFF if a subproject | Alex Merry | 2017-05-15 |
| | | | | | | | | | | | | | | | | | | | | | | | | Now that gRPC_INSTALL is forced off if using bundled third-party libraries, it no longer makes sense to set it OFF by default for MSVC. However, we do want to set it OFF by default if gRPC is being built as a subproject of another project. | ||
| | * | CMake: Disable installation when using bundled third party libraries | Alex Merry | 2017-05-15 |
| | | | | | | | | | | | | | | | If gRPC is not getting its (link-time) dependencies from the system, it should not be attempting installation. | ||
| | * | Revert "cmake: fix #8729" | Alex Merry | 2017-05-15 |
| | | | | | | | | | | | | This reverts commit c019e057c20db0b9c9a2f76fb0b9cd6f44addf92. | ||
| | * | Fix finding c-ares in package mode with CMake | Alex Merry | 2017-05-15 |
| | | | | | | | | | | | | | | | The next release of c-ares will install a CMake package (when built using CMake), but it will be called "c-ares", not "CARES". | ||
* | | | 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 |
|/ / / / |