Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'master' into cancel | Yang Gao | 2015-03-30 |
|\ | |||
| * | Merge pull request #1147 from murgatroid99/php_composer | Tim Emiola | 2015-03-30 |
| |\ | | | | | | | Add composer package information to PHP library | ||
| * \ | Merge pull request #1144 from yang-g/genericstub | Vijay Pai | 2015-03-27 |
| |\ \ | | | | | | | | | generic stub implementation | ||
| | | * | Removed redundant autoload require lines | murgatroid99 | 2015-03-27 |
| | | | | |||
| | * | | Refactor and add a unit test | Yang Gao | 2015-03-27 |
| | | | | |||
| | | * | Merge branch 'master' into php_composer | murgatroid99 | 2015-03-27 |
| | | |\ | | |_|/ | |/| | | |||
| | | * | Replaced existing autoloader with one generated by composer | murgatroid99 | 2015-03-27 |
| | | | | |||
| | | * | Added composer file to PHP library | murgatroid99 | 2015-03-27 |
| | | | | |||
| * | | | Merge pull request #1145 from murgatroid99/docker_install_php | Tim Emiola | 2015-03-27 |
| |\ \ \ | | |_|/ | |/| | | Docker install php | ||
| | * | | Removed ruby installation change | murgatroid99 | 2015-03-27 |
| | | | | |||
| | * | | Updated php_base Dockerfile to install PHP instead of compiling it | murgatroid99 | 2015-03-27 |
| |/ / | |||
| * | | Merge pull request #1113 from vjpai/qps-stream | Yang Gao | 2015-03-27 |
| |\ \ | | | | | | | | | Add C++ streaming QPS test, fix bug in async C++ tests | ||
| | | * | merge upstream and resolve conflict | Yang Gao | 2015-03-26 |
| | | |\ | | |_|/ | |/| | | |||
| | | * | add back mis-deleted method string | Yang Gao | 2015-03-26 |
| | | | | |||
| | | * | Finish grpc_cli | Yang Gao | 2015-03-26 |
| | | | | |||
| * | | | Merge pull request #1141 from nicolasnoble/private-public | Yang Gao | 2015-03-26 |
| |\ \ \ | | | | | | | | | | | Private headers shouldn't be public... | ||
| * \ \ \ | Merge pull request #1143 from nicolasnoble/compiler-opt | Vijay Pai | 2015-03-26 |
| |\ \ \ \ | | | | | | | | | | | | | Small compiler optimization. | ||
| * \ \ \ \ | Merge pull request #1120 from tatsuhiro-t/fix-crash-with-host-header-field | David Klempner | 2015-03-27 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix server crash if host header field is translated to :authority | ||
| | | * | | | | Small compiler optimization. | Nicolas "Pixel" Noble | 2015-03-27 |
| | |/ / / / | |/| | | | | |||
| | | * | | | Private headers shouldn't be public... | Nicolas "Pixel" Noble | 2015-03-27 |
| | |/ / / | |/| | | | |||
| * | | | | Merge pull request #1139 from vjpai/fix_tests_4_4 | Nicolas Noble | 2015-03-26 |
| |\ \ \ \ | | | | | | | | | | | | | Fix most c++ tests for gcc 4.4 | ||
| * \ \ \ \ | Merge pull request #1137 from murgatroid99/php_better_batches | Tim Emiola | 2015-03-26 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Replaced existing PHP files with more batch-based implementation | ||
| * \ \ \ \ \ | Merge pull request #989 from murgatroid99/core_start_batch_trace | Nicolas Noble | 2015-03-26 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Added batch GRPC_TRACE option to trace calls to grpc_call_start_batch | ||
| | | | * | | | | Work around a compiler limitation caused by inability to properly handle | vjpai | 2015-03-26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | vectors created from initializer list | ||
| | | | * | | | | Make string construction explicit as implicit conversion doesn't work in 4.4 | Vijay Pai | 2015-03-26 |
| | | | | | | | | |||
| | | | * | | | | Include the config.h file to make sure that nullptr is covered | vjpai | 2015-03-26 |
| | | | | | | | | |||
| | | | * | | | | Merge remote-tracking branch 'upstream/master' | vjpai | 2015-03-26 |
| | | | |\ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/grpc++/config.h | ||
| | | * | | | | | Replaced existing PHP files with more batch-based implementation | murgatroid99 | 2015-03-26 |
| | |/ / / / / | |/| | | | | | |||
| | | | | * | | Eliminate range-based fors | Vijay Pai | 2015-03-26 |
| | | | | | | | |||
| | | | | * | | Merge branch 'vjpai-qps-stream' into qps-stream | Vijay Pai | 2015-03-26 |
| | | | | |\ \ | |||
| | | | | | * \ | Fix conflicts | Vijay Pai | 2015-03-26 |
| | | | | | |\ \ | | | | | | |/ / | | | | | |/| | | |||
| * | | | | | | | Merge pull request #1134 from murgatroid99/php_interop_ssl_fix | Tim Emiola | 2015-03-26 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix PHP interop test failures | ||
| * \ \ \ \ \ \ \ | Merge pull request #1115 from nicolasnoble/rpc-collision | Yang Gao | 2015-03-26 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Adding the ability to specify a service namespace on protoc's command line. | ||
| * \ \ \ \ \ \ \ \ | Merge pull request #1136 from nicolasnoble/plugins-as-libs | Yang Gao | 2015-03-25 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Moving all of the codegens into a temporary static library. | ||
| * \ \ \ \ \ \ \ \ \ | Merge pull request #1135 from vjpai/fix_gcc_4_4 | Nicolas Noble | 2015-03-25 |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Remove lambda expression from grpc C++ library and make a fake nullptr | ||
| | * \ \ \ \ \ \ \ \ \ | Merge pull request #1 from nicolasnoble/fix_gcc_4_4 | Vijay Pai | 2015-03-25 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding a simple 'buildonly' test. | ||
| | | * | | | | | | | | | | Adding a simple 'buildonly' test. | Nicolas "Pixel" Noble | 2015-03-26 |
| | |/ / / / / / / / / / | |||
| | | * / / / / / / / / | Moving all of the codegens into a temporary static library. | Nicolas "Pixel" Noble | 2015-03-26 |
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow us to re-use code generators in other kind of protoc plugins. | ||
| | | * | | | | | | | | Removing range-based for loop. | Nicolas "Pixel" Noble | 2015-03-25 |
| | | | | | | | | | | | |||
| | * | | | | | | | | | Merge remote-tracking branch 'upstream/master' into fix_gcc_4_4 | vjpai | 2015-03-25 |
| | |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||
| | * | | | | | | | | | Remove lambda expression being used in grpc C++ library | vjpai | 2015-03-25 |
| | | | | | | | | | | | |||
| | * | | | | | | | | | Avoid a problem when clang pretends to be GNUC | vjpai | 2015-03-25 |
| | | | | | | | | | | | |||
| | * | | | | | | | | | Revert "Remove lambda expression to support older compilers" | Vijay Pai | 2015-03-25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5d5b1d8c8ec4c578f72a12f5b81f705764cdf804. | ||
| | | | | | | | | * | | Merge remote-tracking branch 'upstream/master' | Vijay Pai | 2015-03-25 |
| | | | | | | | | |\ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |||
| | * | | | | | | | | | Remove lambda expression to support older compilers | vjpai | 2015-03-25 |
| | | | | | | | | | | | |||
| | * | | | | | | | | | Make a fake version of nullptr to work with old compilers | vjpai | 2015-03-25 |
| | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||
| | | | | | * | | | | Make a fake version of nullptr to satisfy old compilers | vjpai | 2015-03-25 |
| | | |_|_|/ / / / | | |/| | | | | | | |||
| * | | | | | | | | Merge pull request #1133 from yang-g/cleanup | Nicolas Noble | 2015-03-25 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | clean up | ||
| | | | | * \ \ \ \ | Merge branch 'master' into php_interop_ssl_fix | murgatroid99 | 2015-03-25 |
| | | | | |\ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | | | |||
| | | | | * | | | | | Made necessary changes to get interop tests working | murgatroid99 | 2015-03-25 |
| | | | | | | | | | |