aboutsummaryrefslogtreecommitdiffhomepage
path: root/templates
Commit message (Collapse)AuthorAge
* 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
| |\ | |/ |/|
* | Reduce mac CI loadGravatar Craig Tiller2015-08-07
| |
| * Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-08-06
| |\ | |/ |/|
* | Merge pull request #2750 from ctiller/propagateGravatar Yang Gao2015-08-06
|\ \ | | | | | | Core-supported context propagation
| | * Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-08-05
| | |\
* | | | Initial Doxygen import for core, c++Gravatar Craig Tiller2015-08-05
| |_|/ |/| |
| * | Merge github.com:grpc/grpc into propagateGravatar Craig Tiller2015-08-05
| |\ \ | |/ / |/| |
* | | Revert "Fixing environments where pkg-config isn't installed."Gravatar Craig Tiller2015-08-05
| | | | | | | | | | | | This reverts commit 2ed6878412d54ad1a6509de45d6351a3f697bb48.
* | | Merge pull request #2787 from nicolasnoble/no-pkgconfig-is-brokenGravatar Craig Tiller2015-08-04
|\ \ \ | | | | | | | | Fixing environments where pkg-config isn't installed.
* \ \ \ Merge pull request #2652 from nicolasnoble/tests-depend-on-opensslGravatar Craig Tiller2015-08-04
|\ \ \ \ | | | | | | | | | | The code evolved enough so that we now have tests that directly depend on OpenSSL
| | * | | Fixing environments where pkg-config isn't installed.Gravatar Nicolas "Pixel" Noble2015-08-04
| |/ / / |/| | | | | | | | | | | Depending on the presence of pkg-config, we're not necessarily doing the right thing in the Makefile. Zlib is a pkg-config dependency, but libm, libpthread, librt aren't.
| | | * Add zookeeper test in MakefileGravatar Hongwei Wang2015-08-04
| | | |
| | * | Add proxy tests to end2end suiteGravatar Craig Tiller2015-08-04
| |/ / |/| | | | | | | | | | | Currently the oauth2 variant of these tests is disabled. Will work with @jboeuf to figure out how to turn them on.
| | * Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-07-31
| | |\ | |_|/ |/| |
| | * Add zookeeper end-to-end testGravatar Hongwei Wang2015-07-31
| | |
* | | Regenerating project files and massaging VS project files.Gravatar Nicolas Noble2015-07-30
| | |
| | * Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-07-28
| | |\ | |_|/ |/| |
* | | Merge pull request #2506 from larsonmpdx/gittGravatar Nicolas Noble2015-07-28
|\ \ \ | | | | | | | | changes to allow VS solution/project generation and grpc.mak generation for c++ tests
| | | * Merge branch 'iomgr-refcounting' of https://github.com/nicolasnoble/grpc ↵Gravatar Hongwei Wang2015-07-27
| | | |\ | |_|_|/ |/| | | | | | | into zookeeper
| | * | The code evolved enough so that we now have tests that directly depend on ↵Gravatar Nicolas "Pixel" Noble2015-07-24
| |/ / |/| | | | | | | | | | | | | | OpenSSL. Reflecting that in the Makefile so that we don't race against the system when building.
* | | Merge pull request #2474 from nicolasnoble/lets-actually-build-32-bitsGravatar Jan Tattermusch2015-07-20
|\ \ \ | | | | | | | | Making sure we build 32 bits in Jenkins.
| * | | Making sure that 32 bits is being built and run on Jenkins.Gravatar Nicolas "Pixel" Noble2015-07-21
| | | |
| | | * Merge branch 'master' of https://github.com/grpc/grpc into zookeeperGravatar Hongwei Wang2015-07-20
| | | |\ | |_|_|/ |/| | |
| | * | changes to grpc.mak.template to support c++ test buildingGravatar Michael Larson2015-07-19
| | | |
| | * | helper script to build all .proto files in /test/ in-placeGravatar Michael Larson2015-07-19
| | | |
| | * | changed generate_debug_projects.sh to use the .sln hint when making vcxproj ↵Gravatar Michael Larson2015-07-19
| | | | | | | | | | | | | | | | templates
| | * | changed .sln to include hint about lib vs. targetGravatar Michael Larson2015-07-19
| | | |
| | * | changed vsproject generation to make c++ tests; put a hint in the .sln about ↵Gravatar Michael Larson2015-07-19
| |/ / | | | | | | | | | lib vs. target; expand .proto includes
* / / Move head podspec to v0.7.Gravatar Jorge Canizales2015-07-17
|/ / | | | | | | Readd the commented-out config to suppress warnings, to have it handy for submissions.
| * Merge branch 'master' into zookeeperGravatar Hongwei Wang2015-07-17
| |\ | |/ |/|
| * Register zookeeper plugin in grpcGravatar Hongwei Wang2015-07-17
| |
| * Add zookeeper library in Makefile templateGravatar Hongwei Wang2015-07-16
| |
* | Replacing echo -e with a more generic system.Gravatar Nicolas "Pixel" Noble2015-07-15
| | | | | | | | The 'tr' command can actually accept escapes, such as \n.
* | Faking tools target for win32.Gravatar Nicolas "Pixel" Noble2015-07-11
| | | | | | | | With run_test.py, we need a tools target now. Let's fake it for Windows so we can at least build.
* | Merge pull request #2382 from murgatroid99/makefile_cache_detectionGravatar Nicolas Noble2015-07-10
|\ \ | | | | | | Add caching for Makefile dependency detection
| * | Added caching for HAS_SYSTEMTAP in MakefileGravatar murgatroid992015-07-10
| | |
| * | Add caching for Makefile dependency detectionGravatar murgatroid992015-07-10
| | |
* | | Add missing fileGravatar Craig Tiller2015-07-10
|/ /