Craig Tiller
|
5aceb27408
|
Fix include guards
|
9 years ago |
Craig Tiller
|
28435e4d62
|
Merge branch 'optionalize_resolvers' into optionalize_client_config
|
9 years ago |
Craig Tiller
|
db008e2d6e
|
Merge branch 'optionalize_census' into optionalize_resolvers
|
9 years ago |
Craig Tiller
|
502349db91
|
Fix include guards
|
9 years ago |
Craig Tiller
|
016a81d97c
|
Optionalize client_config system
|
9 years ago |
Craig Tiller
|
d4c9833187
|
Reposition files to optionalize client_config system
|
9 years ago |
Craig Tiller
|
dfa160ef73
|
Merge branch 'optionalize_census' into optionalize_resolvers
|
9 years ago |
Craig Tiller
|
bbf85f4ee7
|
Merge github.com:grpc/grpc into optionalize_census
|
9 years ago |
Craig Tiller
|
65938df105
|
Optionalize name resolvers
|
9 years ago |
Nicolas Noble
|
02f5f8de36
|
Merge pull request #6039 from ctiller/copyright-fix
Remove year range requirement for copyright checker
|
9 years ago |
Craig Tiller
|
31efd7e864
|
Merge github.com:grpc/grpc into copyright-fix
|
9 years ago |
Craig Tiller
|
f3f099ada9
|
Merge github.com:grpc/grpc into optionalize_census
|
9 years ago |
Nicolas Noble
|
2b9012362c
|
Merge pull request #5943 from vjpai/make_unix_sockets_great_again
Fix the unix socket #ifdef in init.c
|
9 years ago |
Nicolas Noble
|
7894e60306
|
Merge pull request #6000 from ctiller/optionalize_roundrobin
Optionalize load balancing policies
|
9 years ago |
Craig Tiller
|
64a12c55df
|
Merge github.com:grpc/grpc into copyright-fix
|
9 years ago |
Craig Tiller
|
6169d5f7b0
|
Update copyrights
|
9 years ago |
Craig Tiller
|
6e2cf6b6c7
|
Update tool
|
9 years ago |
Nicolas Noble
|
6fa2ce56f3
|
Merge pull request #6030 from nicolasnoble/upmerge
Upmerge
|
9 years ago |
Nicolas "Pixel" Noble
|
c52e5597a3
|
Merge branch 'release-0_13' into upmerge
Conflicts:
Makefile
build.yaml
package.json
src/core/lib/surface/version.c
src/csharp/Grpc.Core/VersionInfo.cs
src/csharp/build_packages.bat
src/python/grpcio/grpc_version.py
src/ruby/lib/grpc/version.rb
tools/doxygen/Doxyfile.c++
tools/doxygen/Doxyfile.c++.internal
tools/doxygen/Doxyfile.core
tools/doxygen/Doxyfile.core.internal
|
9 years ago |
Nicolas Noble
|
85ed15d3ac
|
Merge pull request #6031 from nicolasnoble/0.13.2-pre1
The release-0_13 branch is now 0.13.2-pre1.
|
9 years ago |
Nicolas Noble
|
a5dc80d22a
|
Merge pull request #5691 from ctiller/idempotent
Idempotent request support for core
|
9 years ago |
Nicolas "Pixel" Noble
|
dc5cd55149
|
The release-0_13 branch is now 0.13.2-pre1.
|
9 years ago |
Bogdan Drutu
|
90da73714e
|
Merge pull request #5699 from ctiller/accounting
Introduce byte counting to the transport API
|
9 years ago |
Nicolas Noble
|
5339cfb820
|
Merge pull request #5764 from ctiller/internal-canary
Initial canaries for downstream merges
|
9 years ago |
Nicolas Noble
|
80893242c1
|
Merge pull request #6026 from nicolasnoble/flagging-0.13.1
Flagging the 0.13.1 release.
|
9 years ago |
Jan Tattermusch
|
b3b961f28f
|
Merge pull request #5984 from jtattermusch/perf_tests_script
Add python script for running performance tests
|
9 years ago |
Nicolas Noble
|
d2597899d0
|
Merge pull request #6021 from grpc/release-0_13
0.13 a tiny upmerge
|
9 years ago |
Jan Tattermusch
|
c42b98200f
|
Merge pull request #5894 from soltanmm/stop-that
Don't allow precompiled binaries in tests
|
9 years ago |
Jan Tattermusch
|
214021a61b
|
Merge pull request #6025 from jtattermusch/csharp_refactor_building_take2
Refactor C# building in run_tests.py (revert a revert)
|
9 years ago |
Craig Tiller
|
5a6b45d915
|
Merge branch 'master' into optionalize_roundrobin
|
9 years ago |
Jan Tattermusch
|
2a322c2815
|
dont break mac build by EMBED_ZLIB=true again
|
9 years ago |
Jan Tattermusch
|
d9ff4562e6
|
make C# mac build use same args as in artifact builder
|
9 years ago |
Nicolas "Pixel" Noble
|
ff084614e0
|
Flagging the 0.13.1 release.
|
9 years ago |
adelez
|
503c3caf08
|
Merge pull request #5966 from jtattermusch/interop_worker_script
Add script to create interop worker
|
9 years ago |
Jan Tattermusch
|
2a4d478dc9
|
Add a comment.
|
9 years ago |
Jan Tattermusch
|
d5a509454e
|
dont break the mac build
|
9 years ago |
Jan Tattermusch
|
b2531e2d16
|
disable C# arch choosing for now
|
9 years ago |
Jan Tattermusch
|
6d28d35279
|
refactor C# building
|
9 years ago |
Jan Tattermusch
|
1f5ad316cd
|
polish some .bat files
|
9 years ago |
Jan Tattermusch
|
a5701c63a7
|
always embed zlib and openssl for C#
|
9 years ago |
Craig Tiller
|
6449049f5d
|
Fix merge error
|
9 years ago |
Craig Tiller
|
801e684556
|
Merge github.com:grpc/grpc into accounting
|
9 years ago |
Craig Tiller
|
15e0dfd345
|
Merge github.com:grpc/grpc into optionalize_roundrobin
|
9 years ago |
Jan Tattermusch
|
e39707458d
|
Merge pull request #6020 from grpc/revert-5963-csharp_refactor_building
Revert "Refactor C# building in run_tests.py"
|
9 years ago |
Craig Tiller
|
56f26a5991
|
Merge branch 'optionalize_roundrobin' into optionalize_census
|
9 years ago |
Craig Tiller
|
6771361fad
|
Merge github.com:grpc/grpc into optionalize_roundrobin
|
9 years ago |
Jan Tattermusch
|
fa51d186d9
|
Merge pull request #6022 from grpc/revert-5933-sockaddr_resolver_lb
Revert "added grpclb support to sockaddr resolver"
|
9 years ago |
Craig Tiller
|
dd2cfc55ab
|
Revert "added grpclb support to sockaddr resolver"
|
9 years ago |
Jan Tattermusch
|
353729a852
|
Merge pull request #6014 from nicolasnoble/manual-upmerge
Manual upmerge from 0.13
|
9 years ago |
Craig Tiller
|
026a3dda92
|
Merge github.com:grpc/grpc into accounting
|
9 years ago |