Nicolas "Pixel" Noble
bc0b08892f
Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split
...
Conflicts:
Makefile
8 years ago
Nicolas Noble
01da196879
Merge pull request #7508 from murgatroid99/v1.0.x_merge_into_master
...
V1.0.x merge into master
8 years ago
kpayson64
cc961b6c5a
Merge pull request #7020 from rjshade/assert_not_expect
...
ASSERT vector size before directly accessing first element
8 years ago
kpayson64
b5fa72c89e
Merge pull request #7451 from y-zeng/seperate_generated_files
...
Separate generated pb files from the server reflection build target, use grpc::protobuf instead of google::protobuf
8 years ago
Nicolas "Pixel" Noble
c326407379
Merge branch 'master' of https://github.com/grpc/grpc into interop_server_split
8 years ago
murgatroid99
1533e6aab9
Rerun generate_projects.sh
8 years ago
kpayson64
de2d9fc07b
Merge pull request #7395 from markdroth/handshake_api
...
General-purpose handshaker API.
8 years ago
murgatroid99
598d5240c0
Fix merge again
8 years ago
kpayson64
13d29841dd
Merge pull request #7501 from dgquintas/phony_async_stream
...
Removed unused version of async_stream.h
8 years ago
Nicolas Noble
da9af3331c
Merge pull request #7320 from yang-g/shut_down_acceptor_early
...
Shutdown the listeners early when destroying the tcp_server
8 years ago
Stanley Cheung
93da284179
Merge pull request #7510 from stanley-cheung/regenerate-template-files
...
Regenerate template files
8 years ago
murgatroid99
224fe989e4
Fixed incorrect merges
8 years ago
Stanley Cheung
bc3b6f3130
regenerate template files
8 years ago
murgatroid99
2b7fe5a6c0
Actually commit changes to tools/distrib/python/grpcio_tools/setup.py
8 years ago
murgatroid99
316f73f6c1
Merge v1.0.x into master
8 years ago
Stanley Cheung
c03c575c86
Merge pull request #7504 from stanley-cheung/php-update-package-xml
...
PHP: update package xml and composer.json
8 years ago
Stanley Cheung
89a8851e68
Merge pull request #7503 from stanley-cheung/php-update-package-xml-v1_0
...
PHP: update package.xml and composer.json
8 years ago
Stanley Cheung
35d8474c0e
php: update composer.json
8 years ago
Stanley Cheung
b8c87fd33d
php: update package.xml to 1.0.0RC2
8 years ago
Stanley Cheung
217c385717
php: update composer.json
8 years ago
Stanley Cheung
31399d20d9
php: update package.xml to 1.0.0RC2
8 years ago
David Garcia Quintas
f77b9bf2fe
Removed unused version of async_stream.h
8 years ago
kpayson64
d4087084f0
Merge pull request #7488 from ghemawat/slice_user_data
...
Add gpr_slice_new_with_user_data.
8 years ago
kpayson64
b8208ff79a
Merge pull request #7269 from y-zeng/cli_call
...
Support server reflection in CLI
8 years ago
kpayson64
73eec148d2
Merge pull request #7491 from kpayson64/remote_linux_whl_artifacts
...
Remove non-manylinux linux .whl artifacts
8 years ago
Yuchen Zeng
26100cb1fe
Rerun generate_projects.sh
8 years ago
Yuchen Zeng
2edf5e904b
Merge remote-tracking branch 'upstream/master' into seperate_generated_files
8 years ago
kpayson64
b8e26c0217
Merge pull request #7486 from dgquintas/alive_typo
...
fixed typo
8 years ago
Nicolas Noble
7645fdc4f0
Merge pull request #7393 from y-zeng/example_makefile
...
Enable server reflection in c++ examples
8 years ago
Nicolas Noble
9cd380c5e1
Merge pull request #7296 from thinkerou/fix_orig
...
Fix orig files for conflicting generated
8 years ago
Nicolas Noble
593fdab480
Merge pull request #7495 from kpayson64/fix_cygrpc_test
...
Fix cygrpc test
8 years ago
Nicolas Noble
27d00b07b0
Merge pull request #7494 from nicolasnoble/no_verbose_fix
...
Make default log verbosity ERROR, run tests with DEBUG
8 years ago
Ken Payson
8d3e9ec9c2
Fix cygrpc test
8 years ago
Nicolas "Pixel" Noble
8bb4ecdcbf
Merge remote-tracking branch 'google/v1.0.x' into no_verbose_fix
...
Conflicts:
tools/run_tests/run_tests.py
8 years ago
Ken Payson
cc17af1681
Remove non-manylinux linux .whl artifacts
8 years ago
Nicolas Noble
f6aefa3ea6
Merge pull request #7400 from yang-g/ga_branch2
...
Cherrypick #7319 into v1.0.x
8 years ago
Stanley Cheung
6b3361bc34
Merge pull request #7489 from stanley-cheung/php-fix-minor-style
...
php: fix minor style discrepency
8 years ago
Mark D. Roth
b16b1f29c3
clang-format
8 years ago
Mark D. Roth
3b17e44eb3
Merge remote-tracking branch 'upstream/master' into handshake_api
8 years ago
Nicolas Noble
c38f160153
Merge pull request #7476 from vjpai/enable_cross
...
Makefile modifications and instructions to enable cross-compilation
8 years ago
Nicolas Noble
d9f2fe7bb9
Merge pull request #7462 from ctiller/backport-delayed-write
...
Backport delayed write into v1.0.x branch
8 years ago
Nicolas Noble
98f47f6169
Merge pull request #7469 from yang-g/proto_lite
...
Add a macro to support protobuf lite
8 years ago
kpayson64
466d8a6bc5
Merge pull request #7465 from grpc/revert-6942-perf_html_report
...
Revert "Generate html report for perf tests"
8 years ago
Nicolas Noble
4f8c76d959
Merge pull request #7490 from nicolasnoble/sanitize-master
...
Sanitizing master.
8 years ago
Nicolas "Pixel" Noble
20b8333efa
Sanitizing master.
8 years ago
Stanley Cheung
4f37dc3ca9
php: fix minor style discrepency
8 years ago
Stanley Cheung
95f04bdfcb
Merge pull request #7487 from thinkerou/on_v1.0.x_support_php7
...
[support PHP7 on v1.0.x branch] control code by version of PHP macro
8 years ago
Stanley Cheung
1f45b40f5c
Merge pull request #7464 from thinkerou/support_php7_by_marco
...
[support PHP7] control code by version of PHP macro
8 years ago
Sanjay Ghemawat
fca59fb2aa
Add gpr_slice_new_with_user_data.
...
gpr_slice_new_with_user_data is like gpr_slice_new, but allows the
caller to specify a distinct pointer to pass to the destroy function.
This is useful when the data is part of a larger data structure that
should be destroyed when the data is no longer needed.
8 years ago
kpayson64
9fee5a4879
Merge pull request #7484 from soltanmm/docgen-impro
...
Upgrade virtualenv pip in Python docgen
8 years ago