Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Resolved merge conflicts with master | murgatroid99 | 2015-10-05 |
|\ | |||
* | | Removed spurious comment from grpc.gyp | murgatroid99 | 2015-10-05 |
| | | |||
| * | Making template agree with clang-format. | Nicolas "Pixel" Noble | 2015-10-03 |
| | | |||
| * | Merge pull request #3602 from grpc/release-0_11 | Tim Emiola | 2015-10-02 |
| |\ | | | | | | | Upmerge from beta to master. | ||
* | | | Removed most of the gyp file, and the tests for it | murgatroid99 | 2015-10-01 |
| | | | | | | | | | | | | | | | There seems to be a bug in node-gyp (nodejs/node-gyp#752) that prevents it from working properly with other gyp files. | ||
* | | | Moved gRPC node package root to repo root, made it depend on grpc.gyp | murgatroid99 | 2015-10-01 |
|/ / | |||
| * | The podspec is generated! | Jorge Canizales | 2015-09-29 |
| | | |||
* | | Merge pull request #3544 from ctiller/backtrace-on-crash | Nicolas Noble | 2015-09-28 |
|\ \ | | | | | | | Enable backtraces on C tests | ||
| * | | Enable backtraces on C tests | Craig Tiller | 2015-09-28 |
| | | | |||
* | | | Merge pull request #2920 from nicolasnoble/winnt-check | Craig Tiller | 2015-09-25 |
|\ \ \ | |/ / |/| | | Better handling of _WIN32_WINNT. | ||
* | | | More PDB trickery | Craig Tiller | 2015-09-25 |
| | | | |||
* | | | Merge github.com:grpc/grpc into shindig | Craig Tiller | 2015-09-24 |
|\ \ \ | |||
* \ \ \ | Merge github.com:grpc/grpc into shindig | Craig Tiller | 2015-09-24 |
|\ \ \ \ | |||
| | * \ \ | Merge github.com:grpc/grpc into come-out-of-the-shadow | Craig Tiller | 2015-09-24 |
| | |\ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge pull request #3372 from grpc/release-0_11 | David G. Quintas | 2015-09-23 |
| |\ \ \ \ | | | |_|/ | | |/| | | Release 0.11 to master upmerge. | ||
* | | | | | Merge github.com:grpc/grpc into shindig | Craig Tiller | 2015-09-23 |
|\| | | | | |||
* | | | | | Enable warnings as errors on Windows | Craig Tiller | 2015-09-23 |
| | | | | | |||
| | * | | | Fixing Makefile issue which would re-evaluate the base path for included ↵ | Nicolas "Pixel" Noble | 2015-09-23 |
| | | | | | | | | | | | | | | | | | | | | dependency files. | ||
| | * | | | Fixing usage of the BUILDDIR variable. | Nicolas "Pixel" Noble | 2015-09-23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now both using absolute and relative directory for that variable should work. BUILDDIR=/tmp/build-grpc make BUILDDIR=../build-grpc make | ||
| * | | | | Fixed TODO comment | murgatroid99 | 2015-09-21 |
| | | | | | |||
| * | | | | Added check for OpenSSL version | murgatroid99 | 2015-09-21 |
| | | | | | |||
| * | | | | Removed C++ build from gyp file, fixed some minor issues | murgatroid99 | 2015-09-21 |
| | | | | | |||
| * | | | | Added grpc.gyp template | murgatroid99 | 2015-09-21 |
|/ / / / | |||
* | | | | Merge pull request #3340 from grpc/release-0_11 | Eric Anderson | 2015-09-14 |
|\| | | | | | | | | | | | Release 0.11 branch to master. | ||
| | * | | Enable -Wshadow | Craig Tiller | 2015-09-11 |
| |/ / |/| | | |||
* | | | Merge github.com:grpc/grpc into immolating-conversion | Craig Tiller | 2015-09-11 |
|\ \ \ | |||
| | * | | Update template to latest changes | Craig Tiller | 2015-09-11 |
| |/ / | |||
* | | | Enable -Wconversion | Craig Tiller | 2015-09-10 |
| | | | |||
* | | | First round of fixing up implicit 64->32 bit conversions | Craig Tiller | 2015-09-10 |
| | | | |||
* | | | Core compiles with -Wsign-conversion | Craig Tiller | 2015-09-10 |
| | | | |||
* | | | Merge github.com:grpc/grpc into immolating-conversion | Craig Tiller | 2015-09-10 |
|\| | | |||
* | | | Sign conversion fixes | Craig Tiller | 2015-09-10 |
| | | | |||
| | * | Merge branch 'master' of github.com:grpc/grpc into winnt-check | Nicolas "Pixel" Noble | 2015-09-04 |
| | |\ | | |/ | |/| | | | | | | | Conflicts: vsprojects/global.props | ||
| * | | Handle test dependencies better | Craig Tiller | 2015-09-01 |
| | | | |||
| * | | Merge branch 'third-coming' into endpoints | Craig Tiller | 2015-09-01 |
| |\ \ | |||
| * | | | Use msbuild for tests | Craig Tiller | 2015-09-01 |
| | | | | |||
| | * | | C tests dont need protobuf | Craig Tiller | 2015-08-31 |
| |/ / | |||
| * | | Hand-written changes | Craig Tiller | 2015-08-31 |
| | | | |||
| * | | Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3 | Jan Tattermusch | 2015-08-26 |
| |\ \ | |/ / |/| | | | | | | | | Conflicts: src/csharp/Grpc.IntegrationTesting/InteropClient.cs | ||
* | | | Its not enough to just serialize the clean step... | Craig Tiller | 2015-08-25 |
| | | | |||
* | | | Dont try to parallelize OpenSSL build | Craig Tiller | 2015-08-25 |
| | | | |||
* | | | Make googletest a submodule | Craig Tiller | 2015-08-24 |
| | | | |||
* | | | Exclude qps_test from tsan runs | Craig Tiller | 2015-08-19 |
| | | | | | | | | | | | | | | | | | | | | | The TSAN deadlock detector has some problems that prevents this test from running successfully. Issue #2994 has been filed to re-enable these in the future. | ||
* | | | Fixing zookeeper's installation. | Nicolas "Pixel" Noble | 2015-08-14 |
| | | | |||
* | | | Merge pull request #2549 from hongweiwang/zookeeper | David G. Quintas | 2015-08-14 |
|\ \ \ | | | | | | | | | Zookeeper name resolver | ||
| | * \ | Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3 | Jan Tattermusch | 2015-08-14 |
| | |\ \ | |_|/ / |/| | | | |||
* | | | | Recreating grpc_test_util_unsecure's template. | Nicolas "Pixel" Noble | 2015-08-14 |
| | | | | |||
* | | | | Let grpc target depend on //external:zlib so that "-lz" or a real zlib | Ming Zhao | 2015-08-13 |
| |_|/ |/| | | | | | | | | | | | | | | target like https://github.com/google/kythe/blob/master/third_party/zlib/BUILD can be pulled in. | ||
| | * | add protobuf.props to plugin projects | Jan Tattermusch | 2015-08-08 |
| |/ |/| | |||
| * | Merge branch 'master' of https://github.com/grpc/grpc into zookeeper | Hongwei Wang | 2015-08-07 |
| |\ | |/ |/| |