aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge pull request #1144 from yang-g/genericstubGravatar Vijay Pai2015-03-27
|\
| * Refactor and add a unit testGravatar Yang Gao2015-03-27
* | Merge pull request #1145 from murgatroid99/docker_install_phpGravatar Tim Emiola2015-03-27
|\ \
| * | Removed ruby installation changeGravatar murgatroid992015-03-27
| * | Updated php_base Dockerfile to install PHP instead of compiling itGravatar murgatroid992015-03-27
|/ /
* | Merge pull request #1113 from vjpai/qps-streamGravatar Yang Gao2015-03-27
|\ \
| | * merge upstream and resolve conflictGravatar Yang Gao2015-03-26
| | |\ | |_|/ |/| |
| | * add back mis-deleted method stringGravatar Yang Gao2015-03-26
| | * Finish grpc_cliGravatar Yang Gao2015-03-26
* | | Merge pull request #1141 from nicolasnoble/private-publicGravatar Yang Gao2015-03-26
|\ \ \
* \ \ \ Merge pull request #1143 from nicolasnoble/compiler-optGravatar Vijay Pai2015-03-26
|\ \ \ \
* \ \ \ \ Merge pull request #1120 from tatsuhiro-t/fix-crash-with-host-header-fieldGravatar David Klempner2015-03-27
|\ \ \ \ \
| | * | | | Small compiler optimization.Gravatar Nicolas "Pixel" Noble2015-03-27
| |/ / / / |/| | | |
| | * | | Private headers shouldn't be public...Gravatar Nicolas "Pixel" Noble2015-03-27
| |/ / / |/| | |
* | | | Merge pull request #1139 from vjpai/fix_tests_4_4Gravatar Nicolas Noble2015-03-26
|\ \ \ \
* \ \ \ \ Merge pull request #1137 from murgatroid99/php_better_batchesGravatar Tim Emiola2015-03-26
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #989 from murgatroid99/core_start_batch_traceGravatar Nicolas Noble2015-03-26
|\ \ \ \ \ \
| | | * | | | Work around a compiler limitation caused by inability to properly handleGravatar vjpai2015-03-26
| | | * | | | Make string construction explicit as implicit conversion doesn't work in 4.4Gravatar Vijay Pai2015-03-26
| | | * | | | Include the config.h file to make sure that nullptr is coveredGravatar vjpai2015-03-26
| | | * | | | Merge remote-tracking branch 'upstream/master'Gravatar vjpai2015-03-26
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | |
| | * | | | | Replaced existing PHP files with more batch-based implementationGravatar murgatroid992015-03-26
| |/ / / / / |/| | | | |
| | | | * | Eliminate range-based forsGravatar Vijay Pai2015-03-26
| | | | * | Merge branch 'vjpai-qps-stream' into qps-streamGravatar Vijay Pai2015-03-26
| | | | |\ \
| | | | | * \ Fix conflictsGravatar Vijay Pai2015-03-26
| | | | | |\ \ | | | | | |/ / | | | | |/| |
* | | | | | | Merge pull request #1134 from murgatroid99/php_interop_ssl_fixGravatar Tim Emiola2015-03-26
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge pull request #1115 from nicolasnoble/rpc-collisionGravatar Yang Gao2015-03-26
|\ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ Merge pull request #1136 from nicolasnoble/plugins-as-libsGravatar Yang Gao2015-03-25
|\ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ Merge pull request #1135 from vjpai/fix_gcc_4_4Gravatar Nicolas Noble2015-03-25
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #1 from nicolasnoble/fix_gcc_4_4Gravatar Vijay Pai2015-03-25
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Adding a simple 'buildonly' test.Gravatar Nicolas "Pixel" Noble2015-03-26
| |/ / / / / / / / / /
| | * / / / / / / / / Moving all of the codegens into a temporary static library.Gravatar Nicolas "Pixel" Noble2015-03-26
| |/ / / / / / / / / |/| | | | | | | | |
| | * | | | | | | | Removing range-based for loop.Gravatar Nicolas "Pixel" Noble2015-03-25
| * | | | | | | | | Merge remote-tracking branch 'upstream/master' into fix_gcc_4_4Gravatar vjpai2015-03-25
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Remove lambda expression being used in grpc C++ libraryGravatar vjpai2015-03-25
| * | | | | | | | | Avoid a problem when clang pretends to be GNUCGravatar vjpai2015-03-25
| * | | | | | | | | Revert "Remove lambda expression to support older compilers"Gravatar Vijay Pai2015-03-25
| | | | | | | | * | Merge remote-tracking branch 'upstream/master'Gravatar Vijay Pai2015-03-25
| | | | | | | | |\ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Remove lambda expression to support older compilersGravatar vjpai2015-03-25
| * | | | | | | | | Make a fake version of nullptr to work with old compilersGravatar vjpai2015-03-25
| | |_|_|_|_|_|/ / | |/| | | | | | |
| | | | | * | | | Make a fake version of nullptr to satisfy old compilersGravatar vjpai2015-03-25
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #1133 from yang-g/cleanupGravatar Nicolas Noble2015-03-25
|\ \ \ \ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' into php_interop_ssl_fixGravatar murgatroid992015-03-25
| | | | |\ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| | | | * | | | | Made necessary changes to get interop tests workingGravatar murgatroid992015-03-25
* | | | | | | | | Merge pull request #1123 from vjpai/range_based_for_removalGravatar Nicolas Noble2015-03-25
|\ \ \ \ \ \ \ \ \
| | * | | | | | | | clang-format c++ code under examplesGravatar Yang Gao2015-03-25
| | * | | | | | | | Clean up unneeded includes and remove shutdown protobuf libraryGravatar Yang Gao2015-03-25
* | | | | | | | | | Merge pull request #1114 from nicolasnoble/windows-fixesGravatar Jan Tattermusch2015-03-25
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| | | | | | | | | * a stub of the cli toolGravatar Yang Gao2015-03-25
| | | * | | | | | | Merge remote-tracking branch 'upstream/master'Gravatar vjpai2015-03-24
| | | |\ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |