aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates
Commit message (Collapse)AuthorAge
* Resolved merge conflicts with masterGravatar murgatroid992015-10-05
|\
* | Removed spurious comment from grpc.gypGravatar murgatroid992015-10-05
| |
| * Making template agree with clang-format.Gravatar Nicolas "Pixel" Noble2015-10-03
| |
| * Merge pull request #3602 from grpc/release-0_11Gravatar Tim Emiola2015-10-02
| |\ | | | | | | Upmerge from beta to master.
* | | Removed most of the gyp file, and the tests for itGravatar murgatroid992015-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.gypGravatar murgatroid992015-10-01
|/ /
| * The podspec is generated!Gravatar Jorge Canizales2015-09-29
| |
* | Merge pull request #3544 from ctiller/backtrace-on-crashGravatar Nicolas Noble2015-09-28
|\ \ | | | | | | Enable backtraces on C tests
| * | Enable backtraces on C testsGravatar Craig Tiller2015-09-28
| | |
* | | Merge pull request #2920 from nicolasnoble/winnt-checkGravatar Craig Tiller2015-09-25
|\ \ \ | |/ / |/| | Better handling of _WIN32_WINNT.
* | | More PDB trickeryGravatar Craig Tiller2015-09-25
| | |
* | | Merge github.com:grpc/grpc into shindigGravatar Craig Tiller2015-09-24
|\ \ \
* \ \ \ Merge github.com:grpc/grpc into shindigGravatar Craig Tiller2015-09-24
|\ \ \ \
| | * \ \ Merge github.com:grpc/grpc into come-out-of-the-shadowGravatar Craig Tiller2015-09-24
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #3372 from grpc/release-0_11Gravatar David G. Quintas2015-09-23
| |\ \ \ \ | | | |_|/ | | |/| | Release 0.11 to master upmerge.
* | | | | Merge github.com:grpc/grpc into shindigGravatar Craig Tiller2015-09-23
|\| | | |
* | | | | Enable warnings as errors on WindowsGravatar Craig Tiller2015-09-23
| | | | |
| | * | | Fixing Makefile issue which would re-evaluate the base path for included ↵Gravatar Nicolas "Pixel" Noble2015-09-23
| | | | | | | | | | | | | | | | | | | | dependency files.
| | * | | Fixing usage of the BUILDDIR variable.Gravatar Nicolas "Pixel" Noble2015-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 commentGravatar murgatroid992015-09-21
| | | | |
| * | | | Added check for OpenSSL versionGravatar murgatroid992015-09-21
| | | | |
| * | | | Removed C++ build from gyp file, fixed some minor issuesGravatar murgatroid992015-09-21
| | | | |
| * | | | Added grpc.gyp templateGravatar murgatroid992015-09-21
|/ / / /
* | | | Merge pull request #3340 from grpc/release-0_11Gravatar Eric Anderson2015-09-14
|\| | | | | | | | | | | Release 0.11 branch to master.
| | * | Enable -WshadowGravatar Craig Tiller2015-09-11
| |/ / |/| |
* | | Merge github.com:grpc/grpc into immolating-conversionGravatar Craig Tiller2015-09-11
|\ \ \
| | * | Update template to latest changesGravatar Craig Tiller2015-09-11
| |/ /
* | | Enable -WconversionGravatar Craig Tiller2015-09-10
| | |
* | | First round of fixing up implicit 64->32 bit conversionsGravatar Craig Tiller2015-09-10
| | |
* | | Core compiles with -Wsign-conversionGravatar Craig Tiller2015-09-10
| | |
* | | Merge github.com:grpc/grpc into immolating-conversionGravatar Craig Tiller2015-09-10
|\| |
* | | Sign conversion fixesGravatar Craig Tiller2015-09-10
| | |
| | * Merge branch 'master' of github.com:grpc/grpc into winnt-checkGravatar Nicolas "Pixel" Noble2015-09-04
| | |\ | | |/ | |/| | | | | | | Conflicts: vsprojects/global.props
| * | Handle test dependencies betterGravatar Craig Tiller2015-09-01
| | |
| * | Merge branch 'third-coming' into endpointsGravatar Craig Tiller2015-09-01
| |\ \
| * | | Use msbuild for testsGravatar Craig Tiller2015-09-01
| | | |
| | * | C tests dont need protobufGravatar Craig Tiller2015-08-31
| |/ /
| * | Hand-written changesGravatar Craig Tiller2015-08-31
| | |
| * | Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3Gravatar Jan Tattermusch2015-08-26
| |\ \ | |/ / |/| | | | | | | | Conflicts: src/csharp/Grpc.IntegrationTesting/InteropClient.cs
* | | Its not enough to just serialize the clean step...Gravatar Craig Tiller2015-08-25
| | |
* | | Dont try to parallelize OpenSSL buildGravatar Craig Tiller2015-08-25
| | |
* | | Make googletest a submoduleGravatar Craig Tiller2015-08-24
| | |
* | | Exclude qps_test from tsan runsGravatar Craig Tiller2015-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.Gravatar Nicolas "Pixel" Noble2015-08-14
| | |
* | | Merge pull request #2549 from hongweiwang/zookeeperGravatar David G. Quintas2015-08-14
|\ \ \ | | | | | | | | Zookeeper name resolver
| | * \ Merge remote-tracking branch 'upstream/master' into csharp_upgrade_to_proto3Gravatar Jan Tattermusch2015-08-14
| | |\ \ | |_|/ / |/| | |
* | | | Recreating grpc_test_util_unsecure's template.Gravatar Nicolas "Pixel" Noble2015-08-14
| | | |
* | | | Let grpc target depend on //external:zlib so that "-lz" or a real zlibGravatar Ming Zhao2015-08-13
| |_|/ |/| | | | | | | | | | | | | | target like https://github.com/google/kythe/blob/master/third_party/zlib/BUILD can be pulled in.
| | * add protobuf.props to plugin projectsGravatar Jan Tattermusch2015-08-08
| |/ |/|
| * Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-08-07
| |\ | |/ |/|